diff --git a/charts/physims/charts/dlsim/values.yaml b/charts/physims/charts/dlsim/values.yaml
index c0142b50ae1704d9a0717c47891fb9f090549991..d78fbb74099a964a7d3ac65c919cdc7a15a6cf07 100644
--- a/charts/physims/charts/dlsim/values.yaml
+++ b/charts/physims/charts/dlsim/values.yaml
@@ -33,7 +33,9 @@ podSecurityContext:
securityContext:
privileged: true
- # capabilities:
+ capabilities:
+ add:
+ - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/ldpctest/values.yaml b/charts/physims/charts/ldpctest/values.yaml
index 91eab91af5418bd248a169d9e8d677a2852f866b..e2e6467923809ce3f8e3bd06e85b10c70e33ff1e 100644
--- a/charts/physims/charts/ldpctest/values.yaml
+++ b/charts/physims/charts/ldpctest/values.yaml
@@ -33,7 +33,9 @@ podSecurityContext:
securityContext:
privileged: true
- # capabilities:
+ capabilities:
+ add:
+ - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-dlschsim/values.yaml b/charts/physims/charts/nr-dlschsim/values.yaml
index e96541102c4f30792350ec3a8aeacc9808bfe6e1..8944e7e7246b284d2d6a32bb74b37b305659bd02 100644
--- a/charts/physims/charts/nr-dlschsim/values.yaml
+++ b/charts/physims/charts/nr-dlschsim/values.yaml
@@ -33,7 +33,9 @@ podSecurityContext:
securityContext:
privileged: true
- # capabilities:
+ capabilities:
+ add:
+ - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-dlsim/values.yaml b/charts/physims/charts/nr-dlsim/values.yaml
index c86fc96cff29c8b9b3cf83594aaa58711c4f0650..573e8630de864cb20ea6e0f658727594668a476a 100644
--- a/charts/physims/charts/nr-dlsim/values.yaml
+++ b/charts/physims/charts/nr-dlsim/values.yaml
@@ -33,7 +33,9 @@ podSecurityContext:
securityContext:
privileged: true
- # capabilities:
+ capabilities:
+ add:
+ - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-pbchsim/values.yaml b/charts/physims/charts/nr-pbchsim/values.yaml
index 62d89f9632c286708ff45fbc99ae387e66f753b3..28c4678334ba2587fabc0d6f23eb38b06d705a7b 100644
--- a/charts/physims/charts/nr-pbchsim/values.yaml
+++ b/charts/physims/charts/nr-pbchsim/values.yaml
@@ -33,7 +33,9 @@ podSecurityContext:
securityContext:
privileged: true
- # capabilities:
+ capabilities:
+ add:
+ - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-prachsim/values.yaml b/charts/physims/charts/nr-prachsim/values.yaml
index 3ea9787f7ab5cf660cfd98e7e61adddb1aa9b47e..9e3c68b54d306899dbb4ba161a0b37afc3d0157d 100644
--- a/charts/physims/charts/nr-prachsim/values.yaml
+++ b/charts/physims/charts/nr-prachsim/values.yaml
@@ -33,7 +33,9 @@ podSecurityContext:
securityContext:
privileged: true
- # capabilities:
+ capabilities:
+ add:
+ - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-pucchsim/values.yaml b/charts/physims/charts/nr-pucchsim/values.yaml
index cf50c0bd3cf8a82feaef6911203e6422b39858ad..449670f71328bf3d070f62abdabb75043ea2d2ec 100644
--- a/charts/physims/charts/nr-pucchsim/values.yaml
+++ b/charts/physims/charts/nr-pucchsim/values.yaml
@@ -33,7 +33,9 @@ podSecurityContext:
securityContext:
privileged: true
- # capabilities:
+ capabilities:
+ add:
+ - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-ulschsim/values.yaml b/charts/physims/charts/nr-ulschsim/values.yaml
index 420b15459655986e89640e20ca2a23b747816528..a3afc090e84527a3471abbe80f231f95452e88db 100644
--- a/charts/physims/charts/nr-ulschsim/values.yaml
+++ b/charts/physims/charts/nr-ulschsim/values.yaml
@@ -33,7 +33,9 @@ podSecurityContext:
securityContext:
privileged: true
- # capabilities:
+ capabilities:
+ add:
+ - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-ulsim/values.yaml b/charts/physims/charts/nr-ulsim/values.yaml
index 7eb8e33fcbcab2c83442fe5b024034bfe2753970..2bf96498e880be7942dfa9e6bfc58e768b203208 100644
--- a/charts/physims/charts/nr-ulsim/values.yaml
+++ b/charts/physims/charts/nr-ulsim/values.yaml
@@ -33,7 +33,9 @@ podSecurityContext:
securityContext:
privileged: true
- # capabilities:
+ capabilities:
+ add:
+ - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/polartest/values.yaml b/charts/physims/charts/polartest/values.yaml
index 496dc8afba245c7c8204618cd01dc4509bf27897..e0a532fdd8f419fe0a6f732cd0c8ec000ccf250c 100644
--- a/charts/physims/charts/polartest/values.yaml
+++ b/charts/physims/charts/polartest/values.yaml
@@ -33,7 +33,9 @@ podSecurityContext:
securityContext:
privileged: true
- # capabilities:
+ capabilities:
+ add:
+ - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/smallblocktest/values.yaml b/charts/physims/charts/smallblocktest/values.yaml
index 9dd791265f2416098e2a2406286337a10ca88a46..f2f113d9b6cc946957c44f9cc34a885992e37a87 100644
--- a/charts/physims/charts/smallblocktest/values.yaml
+++ b/charts/physims/charts/smallblocktest/values.yaml
@@ -33,7 +33,9 @@ podSecurityContext:
securityContext:
privileged: true
- # capabilities:
+ capabilities:
+ add:
+ - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/ulsim/values.yaml b/charts/physims/charts/ulsim/values.yaml
index f5110989d86bb5db489151e88202256f0e57c54e..35dc14d596cf6cbb05b844b84710645e2743479a 100644
--- a/charts/physims/charts/ulsim/values.yaml
+++ b/charts/physims/charts/ulsim/values.yaml
@@ -33,7 +33,9 @@ podSecurityContext:
securityContext:
privileged: true
- # capabilities:
+ capabilities:
+ add:
+ - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index e60651393513bab12e18fafe7b9174f89dbecd29..fdc2bc1597078728190e669bf71e39e14b824f04 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -106,6 +106,9 @@ class Containerize():
self.registrySvrId = ''
self.testSvrId = ''
+ #checkers from xml
+ self.ran_checkers={}
+
#-----------------------------------------------------------
# Container management functions
#-----------------------------------------------------------
@@ -624,7 +627,7 @@ class Containerize():
else:
if containerToKill:
logging.debug('\u001B[1m Analyzing ' + nodeB_prefix + 'NB logfile \u001B[0m ' + self.eNB_logFile[self.eNB_instance])
- logStatus = RAN.AnalyzeLogFile_eNB(self.eNB_logFile[self.eNB_instance], HTML)
+ logStatus = RAN.AnalyzeLogFile_eNB(self.eNB_logFile[self.eNB_instance], HTML, self.ran_checkers)
else:
logStatus = 0
if (logStatus < 0):
@@ -636,7 +639,7 @@ class Containerize():
mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './' + self.eNB_logFile[self.eNB_instance], self.eNBSourceCodePath + '/cmake_targets/')
logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m')
- def DeployGenObject(self, HTML):
+ def DeployGenObject(self, HTML, RAN, UE):
self.exitStatus = 0
logging.info('\u001B[1m Checking Services to deploy\u001B[0m')
cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose config --services'
@@ -679,12 +682,15 @@ class Containerize():
healthy = 0
while (count < 10):
count += 1
+ containerStatus = []
deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
healthy = 0
for state in deployStatus.split('\n'):
- res = re.search('Up \(healthy\)', state)
- if res is not None:
+ if re.search('Up \(healthy\)', state) is not None:
healthy += 1
+ if re.search('rfsim4g-db-init.*Exit 0', state) is not None:
+ subprocess.check_output('docker rm -f rfsim4g-db-init || true', shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
+ containerStatus.append(state)
if healthy == self.nb_healthy[0]:
count = 100
else:
@@ -694,27 +700,41 @@ class Containerize():
if self.tsharkStarted == False:
logging.debug('Starting tshark on public network')
self.CaptureOnDockerNetworks()
- self.tsharkStarted = True
HTML.CreateHtmlTestRow('n/a', 'OK', CONST.ALL_PROCESSES_OK)
+ for cState in containerStatus:
+ logging.debug(cState)
logging.info('\u001B[1m Deploying OAI Object(s) PASS\u001B[0m')
else:
- self.exitStatus = 1
HTML.CreateHtmlTestRow('Could not deploy in time', 'KO', CONST.ALL_PROCESSES_OK)
+ for cState in containerStatus:
+ logging.debug(cState)
logging.error('\u001B[1m Deploying OAI Object(s) FAILED\u001B[0m')
+ HTML.testCase_id = 'AUTO-UNDEPLOY'
+ UE.testCase_id = 'AUTO-UNDEPLOY'
+ HTML.desc = 'Automatic Undeployment'
+ UE.desc = 'Automatic Undeployment'
+ UE.ShowTestID()
+ self.UndeployGenObject(HTML, RAN, UE)
+ self.exitStatus = 1
def CaptureOnDockerNetworks(self):
cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml config | grep com.docker.network.bridge.name | sed -e "s@^.*name: @@"'
networkNames = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
- cmd = 'sudo nohup tshark -f "not tcp and not arp and not port 53 and not host archive.ubuntu.com and not host security.ubuntu.com and not port 2152"'
+ if re.search('4g.*rfsimulator', self.yamlPath[0]) is not None:
+ cmd = 'sudo nohup tshark -f "(host 192.168.61.11 and icmp) or (not host 192.168.61.11 and not host 192.168.61.30 and not arp and not port 53 and not port 2152)"'
+ elif re.search('5g.*rfsimulator', self.yamlPath[0]) is not None:
+ cmd = 'sudo nohup tshark -f "(host 192.168.72.135 and icmp) or (not host 192.168.72.135 and not host 192.168.71.150 and not arp and not port 53 and not port 2152 and not port 2153)"'
+ else:
+ return
for name in networkNames.split('\n'):
- res = re.search('rfsim', name)
- if res is not None:
+ if re.search('rfsim', name) is not None:
cmd += ' -i ' + name
cmd += ' -w /tmp/capture_'
ymlPath = self.yamlPath[0].split('/')
cmd += ymlPath[1] + '.pcap > /tmp/tshark.log 2>&1 &'
logging.debug(cmd)
networkNames = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
+ self.tsharkStarted = True
def UndeployGenObject(self, HTML, RAN, UE):
self.exitStatus = 0
@@ -745,7 +765,11 @@ class Containerize():
cName = res.group('container_name')
cmd = 'cd ' + self.yamlPath[0] + ' && docker logs ' + cName + ' > ' + cName + '.log 2>&1'
logging.debug(cmd)
- deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
+ subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
+ if re.search('magma-mme', cName) is not None:
+ cmd = 'cd ' + self.yamlPath[0] + ' && docker cp -L ' + cName + ':/var/log/mme.log ' + cName + '-full.log'
+ logging.debug(cmd)
+ subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
fullStatus = True
if anyLogs:
cmd = 'mkdir -p '+ logPath + ' && cp ' + self.yamlPath[0] + '/*.log ' + logPath
@@ -767,9 +791,10 @@ class Containerize():
continue
logging.debug('\u001B[1m Analyzing xNB logfile ' + filename + ' \u001B[0m')
- logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML)
+ logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
if (logStatus < 0):
fullStatus = False
+ self.exitStatus = 1
HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
else:
HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
diff --git a/ci-scripts/cls_log_mgt.py b/ci-scripts/cls_log_mgt.py
index 7fb45ed3ea0f83bdb648c1b5dfe726793f03cca8..cf7b91d3c057468ad922804aaf95a4001ce37f06 100644
--- a/ci-scripts/cls_log_mgt.py
+++ b/ci-scripts/cls_log_mgt.py
@@ -93,7 +93,7 @@ class Log_Mgt:
avail_space =int(self.__CheckAvailSpace())*1000 #avail space in target folder, initially displayed in Gb
avg_size=self.__AvgSize() #average size of artifacts in the target folder
logging.debug("Avail Space : " + str(avail_space) + " / Artifact Avg Size : " + str(avg_size))
- if avail_space < 2*avg_size: #reserved space is 2x artifact file ; oldest file will be deleted
+ if avail_space < 50*avg_size: #reserved space is 50x artifact file ; oldest file will be deleted
oldestfile=self.__GetOldestFile()
HOST=self.Username+'@'+self.IPAddress
COMMAND="echo " + self.Password + " | sudo -S rm "+ self.path + "/" + oldestfile
diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index 05bac18900cc67d6b528f02f916052b36cec7480..5d89a7b2e0bdac3c4bb442d1695d93c0cefdd173 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -2047,13 +2047,30 @@ class OaiCiTest():
def Iperf_analyzeV2BIDIR(self, lock, UE_IPAddress, device_id, statusQueue,server_filename,client_filename):
- #server file is unused for the moment
- if (not os.path.isfile(client_filename)):
- self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Could not analyze from client log')
+
+ #check the 2 files are here
+ if (not os.path.isfile(client_filename)) or (not os.path.isfile(server_filename)):
+ self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Client or Server Log File not present')
+ return
+ #check the 2 files size
+ if (os.path.getsize(client_filename)==0) and (os.path.getsize(server_filename)==0):
+ self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Client and Server Log File are empty')
return
- report=[]
- report_msg='Client Report:\n'
- with open(client_filename, 'r') as f_client:
+
+ report_msg='TCP BIDIR Report:\n'
+ #if client is not empty, all the info is in, otherwise we ll use the server file to get some partial info
+ client_filesize = os.path.getsize(client_filename)
+ if client_filesize == 0:
+ report_msg+="Client file (UE) present but !!! EMPTY !!!\n"
+ report_msg+="Partial report from server file\n"
+ filename = server_filename
+ else :
+ report_msg+="Report from client file (UE)\n"
+ filename = client_filename
+
+ report=[] #used to check if relevant lines were found
+
+ with open(filename, 'r') as f_client:
for line in f_client.readlines():
result = re.search(rf'^\[\s+\d+\](?P<direction>\[.+\]).*\s+(?P<bitrate>[0-9\.]+ [KMG]bits\/sec).*\s+(?P<role>\bsender|receiver\b)', str(line))
if result is not None:
@@ -2070,7 +2087,7 @@ class OaiCiTest():
logging.debug('\u001B[1;35m ' + report_msg + '\u001B[0m')
lock.release()
else:
- self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Could not analyze from client log')
+ self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Could not analyze from Log file')
@@ -2386,7 +2403,7 @@ class OaiCiTest():
iperf_time = self.Iperf_ComputeTime()
if self.iperf_direction=="DL":
logging.debug("Iperf for Module in DL mode detected")
- #server side UE
+ ##server side UE
server_filename='iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
cmd = 'rm ' + server_filename
@@ -2394,20 +2411,21 @@ class OaiCiTest():
cmd = 'echo $USER; nohup iperf -s -B ' + UE_IPAddress + ' -u 2>&1 > ' + server_filename + ' &'
SSH.command(cmd,'\$',5)
SSH.close()
- #client side EPC
+ ##client side EPC
SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
client_filename = 'iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
-
+ #remove old client file in EPC.SourceCodePath
+ cmd = 'rm ' + EPC.SourceCodePath + '/' + client_filename
+ SSH.command(cmd,'\$',5)
iperf_cmd = 'bin/iperf -c ' + UE_IPAddress + ' ' + self.iperf_args + ' 2>&1 > ' + client_filename
- cmd = 'docker exec -it prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"'
+ cmd = 'docker exec -w /iperf-2.0.13 -it prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"'
SSH.command(cmd,'\$',int(iperf_time)*5.0)
SSH.command('docker cp prod-trf-gen:/iperf-2.0.13/'+ client_filename + ' ' + EPC.SourceCodePath, '\$', 5)
- SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + client_filename, '.')
SSH.close()
- #copy the 2 resulting files locally
+ #copy the 2 resulting files locally (python executor)
SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, server_filename, '.')
- SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, client_filename, '.')
+ SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + client_filename, '.')
#send for analysis
self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, self.iperf_args,server_filename,1)
@@ -2418,7 +2436,7 @@ class OaiCiTest():
server_filename = 'iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
iperf_cmd = 'echo $USER; nohup bin/iperf -s -u 2>&1 > ' + server_filename
- cmd = 'docker exec -d prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"'
+ cmd = 'docker exec -d -w /iperf-2.0.13 prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"'
SSH.command(cmd,'\$',5)
SSH.close()
@@ -2433,29 +2451,28 @@ class OaiCiTest():
#once client is done, retrieve the server file from container to EPC Host
SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
SSH.command('docker cp prod-trf-gen:/iperf-2.0.13/' + server_filename + ' ' + EPC.SourceCodePath, '\$', 5)
- SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + server_filename, '.')
SSH.close()
#copy the 2 resulting files locally
SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, client_filename, '.')
- SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, server_filename, '.')
+ SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + server_filename, '.')
#send for analysis
self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, self.iperf_args,server_filename,1)
elif self.iperf_direction=="BIDIR":
logging.debug("Iperf for Module in BIDIR mode detected")
- #server side EPC
- SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
server_filename = 'iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
+ client_filename = 'iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
+ #server side EPC
+ SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
iperf_cmd = 'echo $USER; nohup /usr/local/bin/iperf3 -s 2>&1 > ' + server_filename
- cmd = 'docker exec -d prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"'
+ cmd = 'docker exec -d -w /iperf-2.0.13 prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"'
SSH.command(cmd,'\$',5)
SSH.close()
#client side UE
SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
- client_filename = 'iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
cmd = 'rm '+ client_filename
SSH.command(cmd,'\$',5)
SSH.command('iperf3 -B ' + UE_IPAddress + ' -c ' + trf_gen_IP + ' ' + self.iperf_args + ' 2>&1 > ' + client_filename, '\$', int(iperf_time)*5.0)
@@ -2463,13 +2480,17 @@ class OaiCiTest():
#once client is done, retrieve the server file from container to EPC Host
SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+ #remove old server file in EPC.SourceCodePath
+ cmd = 'rm ' + EPC.SourceCodePath + '/' + server_filename
+ SSH.command(cmd,'\$',5)
+ #copy from docker container to EPC.SourceCodePath
SSH.command('docker cp prod-trf-gen:/iperf-2.0.13/' + server_filename + ' ' + EPC.SourceCodePath, '\$', 5)
- SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + server_filename, '.')
SSH.close()
#copy the 2 resulting files locally
SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, client_filename, '.')
- SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, server_filename, '.')
+ SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + server_filename, '.')
+
#send for analysis
self.Iperf_analyzeV2BIDIR(lock, UE_IPAddress, device_id, statusQueue, server_filename, client_filename)
@@ -2484,10 +2505,15 @@ class OaiCiTest():
SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
cmd = 'killall --signal=SIGKILL iperf'
SSH.command(cmd,'\$',5)
+ cmd = 'killall --signal=SIGKILL iperf3'
+ SSH.command(cmd,'\$',5)
SSH.close()
SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
cmd = 'killall --signal=SIGKILL iperf'
SSH.command(cmd,'\$',5)
+ SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+ cmd = 'killall --signal=SIGKILL iperf3'
+ SSH.command(cmd,'\$',5)
SSH.close()
@@ -2540,9 +2566,12 @@ class OaiCiTest():
self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, self.iperf_args,filename,1)
elif self.iperf_direction=="BIDIR":
logging.debug("Iperf for Module in BIDIR mode detected")
+ server_filename = 'iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
+ client_filename = 'iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
+
+
#server side EPC
SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
- server_filename = 'iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
cmd = 'rm ' + server_filename
SSH.command(cmd,'\$',5)
cmd = 'echo $USER; nohup iperf3 -s 2>&1 > '+server_filename+' &'
@@ -2551,7 +2580,6 @@ class OaiCiTest():
#client side UE
SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
- client_filename = 'iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
cmd = 'rm ' + client_filename
SSH.command(cmd,'\$',5)
SSH.command('iperf3 -c 192.172.0.1 ' + self.iperf_args + ' 2>&1 > '+client_filename, '\$', int(iperf_time)*5.0)
@@ -2569,10 +2597,14 @@ class OaiCiTest():
SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
cmd = 'killall --signal=SIGKILL iperf'
SSH.command(cmd,'\$',5)
+ cmd = 'killall --signal=SIGKILL iperf3'
+ SSH.command(cmd,'\$',5)
SSH.close()
SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
cmd = 'killall --signal=SIGKILL iperf'
SSH.command(cmd,'\$',5)
+ cmd = 'killall --signal=SIGKILL iperf3'
+ SSH.command(cmd,'\$',5)
SSH.close()
return
diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py
index b7a730e91c483110ad78df5ce6d34646a2321b42..83fb74b7cb0e030969dd82e654ad2eb4470d184c 100644
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -246,7 +246,7 @@ class PhySim:
isFinished = False
# doing a deep copy!
tmpPodNames = podNames.copy()
- while(count < 32 and isFinished == False):
+ while(count < 50 and isFinished == False):
time.sleep(60)
for podName in tmpPodNames:
mySSH.command2(f'oc logs --tail=1 {podName} 2>&1', 6, silent=True)
diff --git a/ci-scripts/conf_files/benetel-4g.conf b/ci-scripts/conf_files/benetel-4g.conf
index 9423ebe56ecb84c5b2559abf057ce8f1fde8bad3..e2974a171d924086feb848e0fa20592033aec50f 100644
--- a/ci-scripts/conf_files/benetel-4g.conf
+++ b/ci-scripts/conf_files/benetel-4g.conf
@@ -269,17 +269,10 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/benetel-5g.conf b/ci-scripts/conf_files/benetel-5g.conf
index dc86567c1fe70b6ecc18965dc466cd5c1b0ef986..bfe61188b64514fcbff501725624a9330e7a05a9 100644
--- a/ci-scripts/conf_files/benetel-5g.conf
+++ b/ci-scripts/conf_files/benetel-5g.conf
@@ -262,18 +262,11 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/cu.band7.tm1.100PRB.conf b/ci-scripts/conf_files/cu.band7.tm1.100PRB.conf
index e2c94b14ab176b9273373f7631ae3ac188a547c4..1102528cd3721d1b7b5a2922691571b1bacd3008 100644
--- a/ci-scripts/conf_files/cu.band7.tm1.100PRB.conf
+++ b/ci-scripts/conf_files/cu.band7.tm1.100PRB.conf
@@ -201,15 +201,10 @@ eNBs = (
log_config = {
global_log_level = "info";
- global_log_verbosity = "medium";
pdcp_log_level = "info";
- pdcp_log_verbosity = "high";
rrc_log_level = "info";
- rrc_log_verbosity = "medium";
flexran_agent_log_level = "info";
- flexran_agent_log_verbosity = "medium";
gtp_log_level = "info";
- gtp_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
diff --git a/ci-scripts/conf_files/cu.band7.tm1.25PRB.conf b/ci-scripts/conf_files/cu.band7.tm1.25PRB.conf
index 5b994ed29b15cb99f374d7b11fb5e2fc20cc7ab4..ec7620a724419b768f1656a4a9880495fb2e935f 100644
--- a/ci-scripts/conf_files/cu.band7.tm1.25PRB.conf
+++ b/ci-scripts/conf_files/cu.band7.tm1.25PRB.conf
@@ -201,15 +201,10 @@ eNBs = (
log_config = {
global_log_level = "info";
- global_log_verbosity = "medium";
pdcp_log_level = "info";
- pdcp_log_verbosity = "high";
rrc_log_level = "info";
- rrc_log_verbosity = "medium";
flexran_agent_log_level = "info";
- flexran_agent_log_verbosity = "medium";
gtp_log_level = "info";
- gtp_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
diff --git a/ci-scripts/conf_files/cu.band7.tm1.50PRB.conf b/ci-scripts/conf_files/cu.band7.tm1.50PRB.conf
index 148c5a9903f2e435cf17bd884c0234ca6be686e0..7e64ad80393e51087a6368cf40c6ffac4056e88f 100644
--- a/ci-scripts/conf_files/cu.band7.tm1.50PRB.conf
+++ b/ci-scripts/conf_files/cu.band7.tm1.50PRB.conf
@@ -201,15 +201,10 @@ eNBs = (
log_config = {
global_log_level = "info";
- global_log_verbosity = "medium";
pdcp_log_level = "info";
- pdcp_log_verbosity = "high";
rrc_log_level = "info";
- rrc_log_verbosity = "medium";
flexran_agent_log_level = "info";
- flexran_agent_log_verbosity = "medium";
gtp_log_level = "info";
- gtp_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
diff --git a/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf b/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf
index a3ecffb9be7b349cfe35a940483bbf558c0b1856..217c694055c71f74775efc1a58b00b75f3260c9f 100644
--- a/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf
@@ -96,17 +96,11 @@ RUs = (
log_config = {
global_log_level = "info";
- global_log_verbosity = "medium";
hw_log_level = "info";
- hw_log_verbosity = "medium";
phy_log_level = "info";
- phy_log_verbosity = "medium";
mac_log_level = "info";
- mac_log_verbosity = "high";
rlc_log_level = "info";
- rlc_log_verbosity = "medium";
flexran_agent_log_level = "info";
- flexran_agent_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
diff --git a/ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf
index 1920992d70c608a764529c747e3115e274e970ac..61d4cff51b6ec141ae17bccf5c619656db99ae99 100644
--- a/ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf
@@ -96,17 +96,11 @@ RUs = (
log_config = {
global_log_level = "info";
- global_log_verbosity = "medium";
hw_log_level = "info";
- hw_log_verbosity = "medium";
phy_log_level = "info";
- phy_log_verbosity = "medium";
mac_log_level = "info";
- mac_log_verbosity = "high";
rlc_log_level = "info";
- rlc_log_verbosity = "medium";
flexran_agent_log_level = "info";
- flexran_agent_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
diff --git a/ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf b/ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf
index 5df8da05a3aeca11bb4c9c4148f0b00b1bbb0c38..4342e8f4b47f851120c65ebce304267a6feca568 100644
--- a/ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf
@@ -96,17 +96,11 @@ RUs = (
log_config = {
global_log_level = "info";
- global_log_verbosity = "medium";
hw_log_level = "info";
- hw_log_verbosity = "medium";
phy_log_level = "info";
- phy_log_verbosity = "medium";
mac_log_level = "info";
- mac_log_verbosity = "high";
rlc_log_level = "info";
- rlc_log_verbosity = "medium";
flexran_agent_log_level = "info";
- flexran_agent_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
diff --git a/ci-scripts/conf_files/enb.band13.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band13.tm1.25PRB.usrpb210.conf
index e70ca782050be7e67afa529540d178608a7b523b..122654df260522c88d10fcd028afd72e04c35708 100644
--- a/ci-scripts/conf_files/enb.band13.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band13.tm1.25PRB.usrpb210.conf
@@ -257,18 +257,11 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf b/ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf
index 400d1a6c9d8099fbf1beb09ac4c2cce18a61286b..ae572f9e05afb5ef4d53a0c5e97a2735fde62ef1 100644
--- a/ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf
+++ b/ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf
@@ -385,19 +385,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
@@ -457,17 +450,10 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/enb.band17.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band17.tm1.25PRB.usrpb210.conf
index bd2999b5d549037804d4f6f16d1de2aa0129adcd..5a4be9f187313c596be8ca469b2e7d24e056a2b2 100644
--- a/ci-scripts/conf_files/enb.band17.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band17.tm1.25PRB.usrpb210.conf
@@ -260,18 +260,11 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf
index 19ef6d07972c60cfece101229bd8d5436e51da74..7ac056b75e89ce2af11366553e5b9e9b1d08a2fd 100644
--- a/ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf
@@ -404,18 +404,11 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf
index d2e91fb872b39707671ad39e130aa33a092eef51..24c35dedbf07d8afed9075df7179eb3a2d64d678 100644
--- a/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf
@@ -264,18 +264,11 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf
index f116c3708d4dd07544b6effbf8f1f6ca941dbc57..4a16a641058d2a4316e355db37b5b1ca8b8526ce 100644
--- a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf
@@ -264,18 +264,11 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf b/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
index 6c8d5ba6f057c33d591cce1755a7972cfe95bab2..bccd37abe98dc20c033ca4808164adce1821a5d2 100644
--- a/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
@@ -264,18 +264,11 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
index f34878c5691efa7def3f353cbb7922b6a98e8feb..0633d233ef80c265e5d522c6cc0e2caa96840a3f 100644
--- a/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
@@ -165,19 +165,12 @@ eNBs =
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
index e2e482a7c7d98496635bb6d2f2f89b71237d0bfc..4de8a3f759809fdce5f71d2d2c9413cb55a3d7b1 100644
--- a/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
@@ -165,19 +165,12 @@ eNBs =
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
index bfea139e92147d58a8b44e2803e899072ff3121f..df902faf8b581dd13cd5c51e753dca906ede464a 100644
--- a/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
@@ -165,19 +165,12 @@ eNBs =
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf
index 4e0025770b4a645805b9ff17f0b6eccfcf11a777..0da4b1181a02a0cced00bda322822e8a123c6c34 100644
--- a/ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf
@@ -163,19 +163,12 @@ eNBs =
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
index 1627d21e1aefba2c49c003ef85f6c20994ec37b9..bd7e19ca6031f01bba583b70aa95e7f4ee1e31ce 100644
--- a/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
@@ -256,18 +256,11 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/enb.band7.tm1.25PRB.slave.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.25PRB.slave.usrpb210.conf
index efa1fa64b8004325aea95792c11c3f82635a075b..fdd2304ba5d1d14e73fcb8f885b435555c3a5f4c 100644
--- a/ci-scripts/conf_files/enb.band7.tm1.25PRB.slave.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.25PRB.slave.usrpb210.conf
@@ -265,18 +265,11 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
index 6fc84012361a0c9c59d0b7a456f04f2b304525f4..5b05627700f9501199ae639b4075afe4b5b59e80 100644
--- a/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
@@ -263,18 +263,11 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
index 087ee37f01b961d7f09ce997ae14d1bddf626288..44d22a8953b7099f79d4ff45b64d21cc01dd60ec 100644
--- a/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
@@ -263,19 +263,12 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
@include "channelmod_rfsimu.conf"
diff --git a/ci-scripts/conf_files/enb.band7.tm1.fr1.25PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.fr1.25PRB.usrpb210.conf
index 64bcb4b35f0fc5789c5c9754ca75cc7955fd592a..38cd90cd44fb05fc54d84d6b22b04192e134b521 100644
--- a/ci-scripts/conf_files/enb.band7.tm1.fr1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.fr1.25PRB.usrpb210.conf
@@ -264,18 +264,11 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="high";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="high";
pdcp_log_level ="info";
- pdcp_log_verbosity ="high";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf
index 72754165d06319d5e38dec4eecafd0ee933d2b5a..c8223d0c42aa4171f703b232b7b31b613713d05f 100644
--- a/ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf
@@ -258,17 +258,10 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/enb.slave.band13.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/enb.slave.band13.tm1.25PRB.usrpb210.conf
index da65aad775e4154d95f8ff2ea9c7d571c556d89e..609d76d7206c3470383ccb4e7066513a27e8e20e 100644
--- a/ci-scripts/conf_files/enb.slave.band13.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.slave.band13.tm1.25PRB.usrpb210.conf
@@ -262,18 +262,11 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310.conf
index 682fb376cfd95e6a741bbd3d95fee731a55b7dbe..a98179197f159bef82afb5fc3e91cfe7eebc11d3 100644
--- a/ci-scripts/conf_files/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -306,20 +306,12 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
ngap_log_level ="debug";
- ngap_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/episci/episci_nr-ue.nfapi.conf b/ci-scripts/conf_files/episci/episci_nr-ue.nfapi.conf
index f5563ecc026c9e162bebc99afc3232f8080c44b1..22ffb4cd3d2317e93a1e050b905bf124bc767d39 100644
--- a/ci-scripts/conf_files/episci/episci_nr-ue.nfapi.conf
+++ b/ci-scripts/conf_files/episci/episci_nr-ue.nfapi.conf
@@ -1,18 +1,11 @@
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="full";
};
uicc0 = {
diff --git a/ci-scripts/conf_files/episci/episci_nr-ue0.nfapi.conf b/ci-scripts/conf_files/episci/episci_nr-ue0.nfapi.conf
index f5563ecc026c9e162bebc99afc3232f8080c44b1..22ffb4cd3d2317e93a1e050b905bf124bc767d39 100644
--- a/ci-scripts/conf_files/episci/episci_nr-ue0.nfapi.conf
+++ b/ci-scripts/conf_files/episci/episci_nr-ue0.nfapi.conf
@@ -1,18 +1,11 @@
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="full";
};
uicc0 = {
diff --git a/ci-scripts/conf_files/episci/episci_nr-ue1.nfapi.conf b/ci-scripts/conf_files/episci/episci_nr-ue1.nfapi.conf
index 5df3ccf6cc15686af1b3cca34543468a0fb59d56..3d1c008f2361836fac94e8634a8fb096701ae7ce 100644
--- a/ci-scripts/conf_files/episci/episci_nr-ue1.nfapi.conf
+++ b/ci-scripts/conf_files/episci/episci_nr-ue1.nfapi.conf
@@ -1,18 +1,11 @@
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="full";
};
uicc0 = {
diff --git a/ci-scripts/conf_files/episci/episci_nr-ue2.nfapi.conf b/ci-scripts/conf_files/episci/episci_nr-ue2.nfapi.conf
index b1ce5fee8d0ee856ce483658eba66f37149ea46c..73c3292809f0a27ca4cb752b3db33dec7fd8aee4 100644
--- a/ci-scripts/conf_files/episci/episci_nr-ue2.nfapi.conf
+++ b/ci-scripts/conf_files/episci/episci_nr-ue2.nfapi.conf
@@ -1,18 +1,11 @@
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="full";
};
uicc0 = {
diff --git a/ci-scripts/conf_files/episci/episci_nr-ue3.nfapi.conf b/ci-scripts/conf_files/episci/episci_nr-ue3.nfapi.conf
index aea5104f1c6f42356495e15b7910bc0dd659da74..1f8f7306c60eeea212660b5ab9d587694aee34c9 100644
--- a/ci-scripts/conf_files/episci/episci_nr-ue3.nfapi.conf
+++ b/ci-scripts/conf_files/episci/episci_nr-ue3.nfapi.conf
@@ -1,18 +1,11 @@
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="full";
};
uicc0 = {
diff --git a/ci-scripts/conf_files/episci/episci_rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/episci/episci_rcc.band7.tm1.nfapi.conf
index 4e596f81b59b1e72fca2ba3786ccf39479985ac7..81951e521978ae17dd3b5de85f232ab0e0bd6e83 100644
--- a/ci-scripts/conf_files/episci/episci_rcc.band7.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/episci/episci_rcc.band7.tm1.nfapi.conf
@@ -231,17 +231,10 @@ THREAD_STRUCT = (
log_config =
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf b/ci-scripts/conf_files/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
index b64b88ddeabbac5332093567592ef8018520950b..9b3f205a0f36b69f3ddc66f8bf71236ca96f1a0f 100644
--- a/ci-scripts/conf_files/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
+++ b/ci-scripts/conf_files/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
@@ -248,18 +248,11 @@ THREAD_STRUCT = (
log_config =
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/episci/episci_ue.nfapi.conf b/ci-scripts/conf_files/episci/episci_ue.nfapi.conf
index 0170a466552424119c05fa5ae8c6c40cdb45a471..8f7c8ee68a5458762f942f4b7562fbe651f84700 100644
--- a/ci-scripts/conf_files/episci/episci_ue.nfapi.conf
+++ b/ci-scripts/conf_files/episci/episci_ue.nfapi.conf
@@ -1,18 +1,11 @@
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="full";
};
diff --git a/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
index c0d4c6d4c95aa128ab45389e2f55fe021ff4ef30..0597e962455666686da6f69dd2331cd5714dac62 100644
--- a/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -307,20 +307,12 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
ngap_log_level ="debug";
- ngap_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf b/ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf
index 8411ed8fc6d0a2552e109ccfa3040a1a8b523803..b6c0e9b5a10c854a5352f0c616ead7bbc67a00af 100644
--- a/ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf
+++ b/ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf
@@ -1,18 +1,11 @@
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="full";
};
uicc0 = {
diff --git a/ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf
index d4c72d6c1411433ac8fca598def78739009e1236..50ece56b23d2c028c2ea49058bcd9d4a003c6130 100644
--- a/ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf
@@ -231,17 +231,10 @@ THREAD_STRUCT = (
log_config =
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf b/ci-scripts/conf_files/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
index 0ef317d63e8c5d13c0c5d607582d442ddbaa3fda..341010419928648bea390634dfac1c81006724c0 100644
--- a/ci-scripts/conf_files/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
+++ b/ci-scripts/conf_files/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
@@ -288,18 +288,11 @@ THREAD_STRUCT = (
log_config =
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/episci/proxy_ue.nfapi.conf b/ci-scripts/conf_files/episci/proxy_ue.nfapi.conf
index 3f227d573ce08d877303567177ace3a1fb3611b0..51c30fb42de00b1fed2bd2b9b20e7b10876b0a4a 100644
--- a/ci-scripts/conf_files/episci/proxy_ue.nfapi.conf
+++ b/ci-scripts/conf_files/episci/proxy_ue.nfapi.conf
@@ -1,18 +1,11 @@
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="full";
};
diff --git a/ci-scripts/conf_files/gNB_SA_CU.conf b/ci-scripts/conf_files/gNB_SA_CU.conf
index d3cfbfc97368a942bc634a824cc593e37784c214..1e84e479bcd7de445a1c53fc8c265d73c459b895 100644
--- a/ci-scripts/conf_files/gNB_SA_CU.conf
+++ b/ci-scripts/conf_files/gNB_SA_CU.conf
@@ -254,22 +254,13 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="debug";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
ngap_log_level ="debug";
- ngap_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/gNB_SA_DU.conf b/ci-scripts/conf_files/gNB_SA_DU.conf
index adcbcd45d0ce1fd0a75420a2d60ea8c7f92ac785..95fa75bc1de8d0f2dbc789cf74554cb1a6af35e6 100644
--- a/ci-scripts/conf_files/gNB_SA_DU.conf
+++ b/ci-scripts/conf_files/gNB_SA_DU.conf
@@ -273,22 +273,13 @@ serveraddr = "server";
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
- rlc_log_level ="debug";
- rlc_log_verbosity ="medium";
+ rlc_log_level ="info";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
ngap_log_level ="debug";
- ngap_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf b/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
index e3bdde8469350298c09e416bc32316a0990176cb..082cc826f3a95b37a85ef29cce062637be80bedd 100644
--- a/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
@@ -291,19 +291,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf b/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
index 3955b1542ecf28e6f708754fab817900ad49b784..6af8a23407c83d0d194c37458d4de27ce536a642 100644
--- a/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
@@ -287,19 +287,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf b/ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf
index dd9c210c0ddc61e105a0c87a9a4659cb961bebfb..e8c6cab1b496ac0e6295cd2b5ef53c216328e9a8 100644
--- a/ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf
@@ -266,18 +266,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf b/ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf
index 2400136f9f93645addf19345da24d54556fa12c1..7d3409d4d490cfe99fbe1969315ec257547bdc4a 100644
--- a/ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf
@@ -137,20 +137,6 @@ gNBs =
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
subcarrierSpacing = 1;
-
- #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
- referenceSubcarrierSpacing = 1;
- # pattern1
- # dl_UL_TransmissionPeriodicity
- # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
- dl_UL_TransmissionPeriodicity = 6;
- nrofDownlinkSlots = 7;
- nrofDownlinkSymbols = 6;
- nrofUplinkSlots = 2;
- nrofUplinkSymbols = 4;
-
ssPBCH_BlockPower = -25;
}
@@ -259,18 +245,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
index adb79ceb8db7513bd2b5c86506be98431c70e0d1..e798e40d64f767e4be2b82f94c2c9d20fea3c20e 100644
--- a/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
@@ -266,18 +266,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
index b71bd3acd9e932a023a31882689f0238c46457e5..b92c7df92d45255145931ca421e01d681c561817 100644
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
@@ -235,6 +235,7 @@ L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
+ thread_pool_size = 8;
prach_dtx_threshold = 120;
# pucch0_dtx_threshold = 150;
}
@@ -293,19 +294,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
index 32a40fe9516eb60ac3651f4c8428995673fed0c6..6c778a7c3156dd260b28238388bcc389db2bb14a 100644
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -298,19 +298,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
index f28c3167b6b6c7fb2b1feeb1ff4375b92163a3ff..5c826ca862e9a5ec01352c7b952329dbfda239c0 100644
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
@@ -39,11 +39,8 @@ gNBs =
ssb_SubcarrierOffset = 0;
pdsch_AntennaPorts = 1;
- pusch_AntennaPorts = 1;
- #pusch_TargetSNRx10 = 200;
- #pucch_TargetSNRx10 = 200;
- ul_prbblacklist = "51,52,53,54"
- min_rxtxtime = 6;
+ pusch_AntennaPorts = 2;
+ ul_prbblacklist = "79,80,81,82"
pdcch_ConfigSIB1 = (
{
@@ -86,7 +83,7 @@ gNBs =
#initialDownlinkBWP
#genericParameters
# this is RBstart=0,L=106 (275*(L-1))+RBstart
- initialDLBWPlocationAndBandwidth = 31889;
+ initialDLBWPlocationAndBandwidth = 31899;
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
initialDLBWPsubcarrierSpacing = 1;
@@ -94,8 +91,6 @@ gNBs =
initialDLBWPcontrolResourceSetZero = 11;
initialDLBWPsearchSpaceZero = 0;
-
-
#uplinkConfigCommon
#frequencyInfoUL
ul_frequencyBand = 78;
@@ -108,7 +103,7 @@ gNBs =
pMax = 20;
#initialUplinkBWP
#genericParameters
- initialULBWPlocationAndBandwidth = 31889;
+ initialULBWPlocationAndBandwidth = 31899;
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
initialULBWPsubcarrierSpacing = 1;
@@ -229,9 +224,9 @@ MACRLCs = (
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
- pusch_TargetSNRx10 = 200;
- pucch_TargetSNRx10 = 200;
- ulsch_max_frame_inactivity = 1;
+# pusch_TargetSNRx10 = 200;
+# pucch_TargetSNRx10 = 150;
+ ulsch_max_frame_inactivity = 0;
}
);
@@ -239,6 +234,7 @@ L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
+ thread_pool_size = 8;
prach_dtx_threshold = 120;
# pucch0_dtx_threshold = 150;
}
@@ -247,8 +243,8 @@ L1s = (
RUs = (
{
local_rf = "yes"
- nb_tx = 1
- nb_rx = 1
+ nb_tx = 2
+ nb_rx = 2
att_tx = 0
att_rx = 0;
bands = [78];
@@ -297,19 +293,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf b/ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
index 9cc8f554e812d517316e977f0ee93a97066511f9..d21cf90cd93a51e58405419ead809a0c3f883e23 100644
--- a/ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
@@ -255,18 +255,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf b/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
index 249b7e45270bdf61e6ff1b909e1e3806effdd08a..55cb7b36c4dc495678847f78fb41b52f6be64746 100644
--- a/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
@@ -263,19 +263,12 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
uicc: {
diff --git a/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
index f232106d561bb233a9c7be736f7800af1cadd574..7c4bb9cc59d5f6dc5374188ab78672f3c1033353 100644
--- a/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
@@ -265,19 +265,12 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
uicc: {
diff --git a/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf b/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf
new file mode 100644
index 0000000000000000000000000000000000000000..7f5a9d434371e4eeee7c56a5835d93b021141ff3
--- /dev/null
+++ b/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf
@@ -0,0 +1,291 @@
+Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+ ////////// Identification parameters:
+ gNB_ID = 0xe00;
+ gNB_name = "gNB-Eurecom-5GNRBox";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = 1;
+ plmn_list = ({
+ mcc = 208;
+ mnc = 95;
+ mnc_length = 2;
+ snssaiList = (
+ {
+ sst = 1;
+ sd = 0x1; // 0 false, else true
+ },
+ {
+ sst = 2;
+ sd = 2; // 0 false, else true
+ }
+ );
+
+ });
+
+ nr_cellid = 12345678L;
+
+ ////////// Physical parameters:
+
+ ssb_SubcarrierOffset = 0;
+ pdsch_AntennaPorts = 1;
+ pusch_AntennaPorts = 1;
+ min_rxtxtime = 6;
+ sib1_tda = 0;
+
+ pdcch_ConfigSIB1 = (
+ {
+ controlResourceSetZero = 12;
+ searchSpaceZero = 0;
+ }
+ );
+
+ servingCellConfigCommon = (
+ {
+ #spCellConfigCommon
+
+ physCellId = 0;
+
+# downlinkConfigCommon
+ #frequencyInfoDL
+ # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+ absoluteFrequencySSB = 433096;
+ dl_frequencyBand = 66;
+ # this is 3600 MHz
+ dl_absoluteFrequencyPointA = 430000;
+ #scs-SpecificCarrierList
+ dl_offstToCarrier = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ dl_subcarrierSpacing = 1;
+ dl_carrierBandwidth = 106;
+ #initialDownlinkBWP
+ #genericParameters
+ # this is RBstart=27,L=48 (275*(L-1))+RBstart
+ initialDLBWPlocationAndBandwidth = 13475; # 6366 12925 12956 28875 12952
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ initialDLBWPsubcarrierSpacing = 1;
+ #pdcch-ConfigCommon
+ initialDLBWPcontrolResourceSetZero = 12;
+ initialDLBWPsearchSpaceZero = 0;
+
+ #uplinkConfigCommon
+ #frequencyInfoUL
+ ul_frequencyBand = 66;
+ ul_absoluteFrequencyPointA = 350000;
+ #scs-SpecificCarrierList
+ ul_offstToCarrier = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ ul_subcarrierSpacing = 1;
+ ul_carrierBandwidth = 106;
+ pMax = 20;
+ #initialUplinkBWP
+ #genericParameters
+ initialULBWPlocationAndBandwidth = 13475;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ initialULBWPsubcarrierSpacing = 1;
+ #rach-ConfigCommon
+ #rach-ConfigGeneric
+ prach_ConfigurationIndex = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+ prach_msg1_FDM = 0;
+ prach_msg1_FrequencyStart = 0;
+ zeroCorrelationZoneConfig = 13;
+ preambleReceivedTargetPower = -118;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+ preambleTransMax = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+ powerRampingStep = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+ ra_ResponseWindow = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+ ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+ ssb_perRACH_OccasionAndCB_PreamblesPerSSB = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+ ra_ContentionResolutionTimer = 7;
+ rsrp_ThresholdSSB = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+ prach_RootSequenceIndex_PR = 2;
+ prach_RootSequenceIndex = 1;
+ # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+ #
+ msg1_SubcarrierSpacing = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+ restrictedSetConfig = 0,
+
+ msg3_DeltaPreamble = 1;
+ p0_NominalWithGrant =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+ pucchGroupHopping = 0;
+ hoppingId = 40;
+ p0_nominal = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+ ssb_PositionsInBurst_PR = 2;
+ ssb_PositionsInBurst_Bitmap = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+ ssb_periodicityServingCell = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+ dmrs_TypeA_Position = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ subcarrierSpacing = 1;
+
+
+ #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ referenceSubcarrierSpacing = 1;
+ # pattern1
+ # dl_UL_TransmissionPeriodicity
+ # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+ dl_UL_TransmissionPeriodicity = 6;
+ nrofDownlinkSlots = 7;
+ nrofDownlinkSymbols = 6;
+ nrofUplinkSlots = 2;
+ nrofUplinkSymbols = 4;
+
+ ssPBCH_BlockPower = -25;
+ }
+
+ );
+
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// MME parameters:
+ amf_ip_address = ( { ipv4 = "192.168.70.132";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+
+ NETWORK_INTERFACES :
+ {
+ GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai";
+ GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24";
+ GNB_INTERFACE_NAME_FOR_NGU = "demo-oai";
+ GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24";
+ GNB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+
+ }
+);
+
+MACRLCs = (
+ {
+ num_cc = 1;
+ tr_s_preference = "local_L1";
+ tr_n_preference = "local_RRC";
+ ulsch_max_slots_inactivity = 100;
+ pusch_TargetSNRx10 = 200;
+ pucch_TargetSNRx10 = 200;
+ }
+);
+
+L1s = (
+ {
+ num_cc = 1;
+ tr_n_preference = "local_mac";
+ pusch_proc_threads = 8;
+ ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+ }
+);
+
+RUs = (
+ {
+ local_rf = "yes"
+ nb_tx = 1
+ nb_rx = 1
+ att_tx = 0
+ att_rx = 0;
+ bands = [7];
+ max_pdschReferenceSignalPower = -27;
+ max_rxgain = 75;
+ eNB_instances = [0];
+ #beamforming 1x4 matrix:
+ bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
+ clock_src = "internal";
+ }
+);
+
+THREAD_STRUCT = (
+ {
+ #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+ parallel_config = "PARALLEL_SINGLE_THREAD";
+ #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+ worker_config = "WORKER_ENABLE";
+ }
+);
+
+rfsimulator :
+{
+ serveraddr = "server";
+ serverport = "4043";
+ options = (); #("saviq"); or/and "chanmod"
+ modelname = "AWGN";
+ IQfile = "/tmp/rfsimulator.iqs";
+};
+
+security = {
+ # preferred ciphering algorithms
+ # the first one of the list that an UE supports in chosen
+ # valid values: nea0, nea1, nea2, nea3
+ ciphering_algorithms = ( "nea0" );
+
+ # preferred integrity algorithms
+ # the first one of the list that an UE supports in chosen
+ # valid values: nia0, nia1, nia2, nia3
+ integrity_algorithms = ( "nia2", "nia0" );
+
+ # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+ # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+ drb_ciphering = "yes";
+ drb_integrity = "no";
+};
+
+ log_config :
+ {
+ global_log_level ="info";
+ hw_log_level ="info";
+ phy_log_level ="info";
+ mac_log_level ="info";
+ rlc_log_level ="info";
+ pdcp_log_level ="info";
+ rrc_log_level ="info";
+ ngap_log_level ="debug";
+ };
+
diff --git a/ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf b/ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf
new file mode 100644
index 0000000000000000000000000000000000000000..bd3076a014cc9d75098288ca4c0cca05cb8b0d29
--- /dev/null
+++ b/ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf
@@ -0,0 +1,301 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+ ////////// Identification parameters:
+ gNB_ID = 0xe00;
+ gNB_name = "gNB-OAI";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = 1;
+ plmn_list = ({
+ mcc = 208;
+ mnc = 99;
+ mnc_length = 2;
+ snssaiList = (
+ {
+ sst = 1;
+ sd = 0x1; // 0 false, else true
+ },
+ {
+ sst = 1;
+ sd = 0x112233; // 0 false, else true
+ }
+ );
+
+ });
+
+ nr_cellid = 12345678L;
+
+ ////////// Physical parameters:
+
+ ssb_SubcarrierOffset = 0;
+ pdsch_AntennaPorts = 1;
+ pusch_AntennaPorts = 1;
+ sib1_tda = 15;
+ min_rxtxtime = 6;
+
+ pdcch_ConfigSIB1 = (
+ {
+ controlResourceSetZero = 2;
+ searchSpaceZero = 0;
+ }
+ );
+
+ servingCellConfigCommon = (
+ {
+ #spCellConfigCommon
+
+ physCellId = 0;
+
+# downlinkConfigCommon
+ #frequencyInfoDL
+ # this is 3600 MHz + 12 PRBs@30kHz SCS (same as initial BWP)
+ absoluteFrequencySSB = 640288;
+ dl_frequencyBand = 78;
+ # this is 3600 MHz
+ dl_absoluteFrequencyPointA = 640000;
+ #scs-SpecificCarrierList
+ dl_offstToCarrier = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ dl_subcarrierSpacing = 1;
+ dl_carrierBandwidth = 24;
+ #initialDownlinkBWP
+ #genericParameters
+ # this is RBstart=27,L=48 (275*(L-1))+RBstart
+ initialDLBWPlocationAndBandwidth = 6325;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ initialDLBWPsubcarrierSpacing = 1;
+ #pdcch-ConfigCommon
+ initialDLBWPcontrolResourceSetZero = 2;
+ initialDLBWPsearchSpaceZero = 0;
+
+ #uplinkConfigCommon
+ #frequencyInfoUL
+ ul_frequencyBand = 78;
+ #scs-SpecificCarrierList
+ ul_offstToCarrier = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ ul_subcarrierSpacing = 1;
+ ul_carrierBandwidth = 24;
+ pMax = 20;
+ #initialUplinkBWP
+ #genericParameters
+ initialULBWPlocationAndBandwidth = 6325;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ initialULBWPsubcarrierSpacing = 1;
+ #rach-ConfigCommon
+ #rach-ConfigGeneric
+ prach_ConfigurationIndex = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+ prach_msg1_FDM = 0;
+ prach_msg1_FrequencyStart = 0;
+ zeroCorrelationZoneConfig = 13;
+ preambleReceivedTargetPower = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+ preambleTransMax = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+ powerRampingStep = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+ ra_ResponseWindow = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+ ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+ ssb_perRACH_OccasionAndCB_PreamblesPerSSB = 14;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+ ra_ContentionResolutionTimer = 7;
+ rsrp_ThresholdSSB = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+ prach_RootSequenceIndex_PR = 2;
+ prach_RootSequenceIndex = 1;
+ # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+ #
+ msg1_SubcarrierSpacing = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+ restrictedSetConfig = 0,
+
+ msg3_DeltaPreamble = 1;
+ p0_NominalWithGrant =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+ pucchGroupHopping = 0;
+ hoppingId = 40;
+ p0_nominal = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+ ssb_PositionsInBurst_PR = 2;
+ ssb_PositionsInBurst_Bitmap = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+ ssb_periodicityServingCell = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+ dmrs_TypeA_Position = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ subcarrierSpacing = 1;
+
+
+ #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ referenceSubcarrierSpacing = 1;
+ # pattern1
+ # dl_UL_TransmissionPeriodicity
+ # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+ dl_UL_TransmissionPeriodicity = 6;
+ nrofDownlinkSlots = 7;
+ nrofDownlinkSymbols = 6;
+ nrofUplinkSlots = 2;
+ nrofUplinkSymbols = 4;
+
+ ssPBCH_BlockPower = -25;
+ }
+
+ );
+
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// AMF parameters:
+ amf_ip_address = ( { ipv4 = "192.168.70.132";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+
+ NETWORK_INTERFACES :
+ {
+ GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai";
+ GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24";
+ GNB_INTERFACE_NAME_FOR_NGU = "demo-oai";
+ GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24";
+ GNB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+
+ }
+);
+
+MACRLCs = (
+{
+ num_cc = 1;
+ tr_s_preference = "local_L1";
+ tr_n_preference = "local_RRC";
+ pusch_TargetSNRx10 = 150;
+ pucch_TargetSNRx10 = 200;
+ ulsch_max_frame_inactivity = 1;
+}
+);
+
+L1s = (
+{
+ num_cc = 1;
+ tr_n_preference = "local_mac";
+ pusch_proc_threads = 8;
+ prach_dtx_threshold = 120;
+ pucch0_dtx_threshold = 150;
+ ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+}
+);
+
+RUs = (
+{
+ local_rf = "yes"
+ nb_tx = 1
+ nb_rx = 1
+ att_tx = 0
+ att_rx = 0;
+ bands = [78];
+ max_pdschReferenceSignalPower = -27;
+ max_rxgain = 114;
+ sf_extension = 0;
+ eNB_instances = [0];
+ #beamforming 1x4 matrix:
+ bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
+ clock_src = "internal";
+}
+);
+
+THREAD_STRUCT = (
+{
+ #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+ parallel_config = "PARALLEL_SINGLE_THREAD";
+ #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+ worker_config = "WORKER_ENABLE";
+}
+);
+
+rfsimulator :
+{
+ serveraddr = "server";
+ serverport = "4043";
+ options = (); #("saviq"); or/and "chanmod"
+ modelname = "AWGN";
+ IQfile = "/tmp/rfsimulator.iqs";
+};
+
+security = {
+ # preferred ciphering algorithms
+ # the first one of the list that an UE supports in chosen
+ # valid values: nea0, nea1, nea2, nea3
+ ciphering_algorithms = ( "nea0" );
+
+ # preferred integrity algorithms
+ # the first one of the list that an UE supports in chosen
+ # valid values: nia0, nia1, nia2, nia3
+ integrity_algorithms = ( "nia2", "nia0" );
+
+ # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+ # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+ drb_ciphering = "yes";
+ drb_integrity = "no";
+};
+
+log_config :
+{
+ global_log_level ="info";
+ global_log_verbosity ="medium";
+ hw_log_level ="info";
+ hw_log_verbosity ="medium";
+ phy_log_level ="info";
+ phy_log_verbosity ="medium";
+ mac_log_level ="info";
+ mac_log_verbosity ="high";
+ rlc_log_level ="info";
+ rlc_log_verbosity ="medium";
+ pdcp_log_level ="info";
+ pdcp_log_verbosity ="medium";
+ rrc_log_level ="info";
+ rrc_log_verbosity ="medium";
+ ngap_log_level ="debug";
+ ngap_log_verbosity ="medium";
+};
+
diff --git a/ci-scripts/conf_files/lte-fdd-basic-sim.conf b/ci-scripts/conf_files/lte-fdd-basic-sim.conf
index a4d8e007dcc2365ea5617d6f83bdb7eee5171556..6c81d512a6c92b68c230a05b3285591aa18385e1 100644
--- a/ci-scripts/conf_files/lte-fdd-basic-sim.conf
+++ b/ci-scripts/conf_files/lte-fdd-basic-sim.conf
@@ -257,17 +257,10 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/lte-fdd-fembms-basic-sim.conf b/ci-scripts/conf_files/lte-fdd-fembms-basic-sim.conf
index 458ab7cf89b365fb2c8b113a276dde6c74bae2b4..c2f6ab9d6c79071bc24d4ce5b9f61e93b6665e06 100644
--- a/ci-scripts/conf_files/lte-fdd-fembms-basic-sim.conf
+++ b/ci-scripts/conf_files/lte-fdd-fembms-basic-sim.conf
@@ -406,19 +406,12 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
//rfsimulator :
diff --git a/ci-scripts/conf_files/lte-fdd-mbms-basic-sim.conf b/ci-scripts/conf_files/lte-fdd-mbms-basic-sim.conf
index e80ff2b9cb8ec058e17079725db0a30a831c4f84..9c74d2e328353354624f10019a4ee2a7a56e1225 100644
--- a/ci-scripts/conf_files/lte-fdd-mbms-basic-sim.conf
+++ b/ci-scripts/conf_files/lte-fdd-mbms-basic-sim.conf
@@ -406,19 +406,12 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
//rfsimulator :
diff --git a/ci-scripts/conf_files/lte-tdd-basic-sim.conf b/ci-scripts/conf_files/lte-tdd-basic-sim.conf
index f443a907f2e1834c186221f15a3bddab0f7de1c3..ddfdddda83c08edff44645c7117866c82de52057 100644
--- a/ci-scripts/conf_files/lte-tdd-basic-sim.conf
+++ b/ci-scripts/conf_files/lte-tdd-basic-sim.conf
@@ -165,19 +165,12 @@ eNBs =
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/ci-scripts/conf_files/nr-ue.nfapi.conf b/ci-scripts/conf_files/nr-ue.nfapi.conf
index b12e0c8d05beee6edaa4de41334f8beace656c19..90798702cf93ff59974da55ce0300712931da2a4 100644
--- a/ci-scripts/conf_files/nr-ue.nfapi.conf
+++ b/ci-scripts/conf_files/nr-ue.nfapi.conf
@@ -1,18 +1,11 @@
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="full";
};
diff --git a/ci-scripts/conf_files/rcc.band38.tm1.50PRB.multi.rru.conf b/ci-scripts/conf_files/rcc.band38.tm1.50PRB.multi.rru.conf
index 502e3c548a4ebd7fad92217b2294f745ea5bc577..6651f380e499283b9034790974cd6d7c3f320d32 100644
--- a/ci-scripts/conf_files/rcc.band38.tm1.50PRB.multi.rru.conf
+++ b/ci-scripts/conf_files/rcc.band38.tm1.50PRB.multi.rru.conf
@@ -227,17 +227,10 @@ THREAD_STRUCT = (
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
index d01e4e1c4e039ba4e77888b8b29537b9798c16a0..47bcc35cb38952a9840b90c5075617ee10fa3751 100644
--- a/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
@@ -168,19 +168,12 @@ eNBs =
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
index 7f6bff304d6d3fe9d52fed202369256d2a66e25a..660478ca11512f9ee80c8a4801a947102dd86c6a 100644
--- a/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
@@ -168,19 +168,12 @@ eNBs =
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
index d4f2eb9ef2f46def7cb4e273ee1f8ce9e303e6e2..6997c8023424083a46817616e2cbeda2b9ec04c5 100644
--- a/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
@@ -168,19 +168,12 @@ eNBs =
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
index 683fff0bc800106c28dd84f51c6df3a5d7036d07..798871edce715c41df0d348cb09ece3c8aab28ca 100644
--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
@@ -263,17 +263,10 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
index 574c8b25456d5ce7d8f9d72f4a2c379e64143798..628188aea25e538cef4eade05de68cde401e60df 100644
--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
@@ -263,17 +263,10 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
index 49365a1f616e58a44e7641c68b2a4d153fab9664..75d947c009325aed640edae7aa6710ea84725f2d 100644
--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
@@ -263,17 +263,10 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf
index 640b85930a2f525ff613eee906f3923e88978d56..1bcd26b931dc30fed0d2e98815db6feb93c9ae9b 100644
--- a/ci-scripts/conf_files/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf
@@ -365,17 +365,10 @@ THREAD_STRUCT = (
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf
index 7fe682f29edd7e8b352631ee8356e43afcf95935..e398310a35561d0f565be57bb94ea80b975da927 100644
--- a/ci-scripts/conf_files/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf
@@ -365,17 +365,10 @@ THREAD_STRUCT = (
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
index 281f7433af58217262fcda6cc914a07651b32b80..6f7a5d2dfdb96878d43e39675e1db820467d7ade 100644
--- a/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
@@ -230,17 +230,10 @@ THREAD_STRUCT = (
log_config =
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/rru.band38.tm1.master.conf b/ci-scripts/conf_files/rru.band38.tm1.master.conf
index 101ce83892e66d3d52ef1a70b55be9c24ca384e4..e6bd0b75aacb7e7d9df598025190414df83316f6 100644
--- a/ci-scripts/conf_files/rru.band38.tm1.master.conf
+++ b/ci-scripts/conf_files/rru.band38.tm1.master.conf
@@ -30,18 +30,11 @@ THREAD_STRUCT = (
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/rru.band38.tm1.slave.conf b/ci-scripts/conf_files/rru.band38.tm1.slave.conf
index d5efe6bd61ae925e9c08cf12350a6635abbcec27..2bc79028b4cf82e253dfa1442c65cc35a125f9cf 100644
--- a/ci-scripts/conf_files/rru.band38.tm1.slave.conf
+++ b/ci-scripts/conf_files/rru.band38.tm1.slave.conf
@@ -30,18 +30,11 @@ THREAD_STRUCT = (
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/rru.fdd.band7.conf b/ci-scripts/conf_files/rru.fdd.band7.conf
index 057f518046573be0b8de1bfc15096792bbe38964..a3b297049dc494c302eb0d247b22e51be3618f57 100644
--- a/ci-scripts/conf_files/rru.fdd.band7.conf
+++ b/ci-scripts/conf_files/rru.fdd.band7.conf
@@ -31,17 +31,10 @@ THREAD_STRUCT =
log_config =
{
global_log_level ="error";
- global_log_verbosity ="medium";
hw_log_level ="error";
- hw_log_verbosity ="medium";
phy_log_level ="error";
- phy_log_verbosity ="medium";
mac_log_level ="error";
- mac_log_verbosity ="high";
rlc_log_level ="error";
- rlc_log_verbosity ="medium";
pdcp_log_level ="error";
- pdcp_log_verbosity ="medium";
rrc_log_level ="error";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/rru.tdd.band40.conf b/ci-scripts/conf_files/rru.tdd.band40.conf
index 5ce3a515f58987b63d4a578925eb24a7cf5de4d2..40af241cca2696d577d988ce0ceb9da4ece8ab77 100644
--- a/ci-scripts/conf_files/rru.tdd.band40.conf
+++ b/ci-scripts/conf_files/rru.tdd.band40.conf
@@ -31,17 +31,10 @@ THREAD_STRUCT =
log_config =
{
global_log_level ="error";
- global_log_verbosity ="medium";
hw_log_level ="error";
- hw_log_verbosity ="medium";
phy_log_level ="error";
- phy_log_verbosity ="medium";
mac_log_level ="error";
- mac_log_verbosity ="high";
rlc_log_level ="error";
- rlc_log_verbosity ="medium";
pdcp_log_level ="error";
- pdcp_log_verbosity ="medium";
rrc_log_level ="error";
- rrc_log_verbosity ="medium";
};
diff --git a/ci-scripts/conf_files/ue.nfapi.conf b/ci-scripts/conf_files/ue.nfapi.conf
index 2b602cbcf292902e6702f134aeabfaa012956185..09ad7529b1541190859ab923c2f6a91d103aba14 100644
--- a/ci-scripts/conf_files/ue.nfapi.conf
+++ b/ci-scripts/conf_files/ue.nfapi.conf
@@ -1,18 +1,11 @@
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="full";
};
diff --git a/ci-scripts/constants.py b/ci-scripts/constants.py
index 3c056759283a973543e16d61f6a57d984dd2ac8c..4f82811ac1e8ee93067ea76bd40ffe200f3564bb 100644
--- a/ci-scripts/constants.py
+++ b/ci-scripts/constants.py
@@ -45,6 +45,7 @@ ENB_PROCESS_REALTIME_ISSUE = -13
ENB_PROCESS_NOLOGFILE_TO_ANALYZE = -14
ENB_PROCESS_SLAVE_RRU_NOT_SYNCED = -15
ENB_REAL_TIME_PROCESSING_ISSUE = -16
+ENB_RETX_ISSUE = -17
HSS_PROCESS_FAILED = -2
HSS_PROCESS_OK = +2
MME_PROCESS_FAILED = -3
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 43772fb655f3b65bce5a8abd2b115d7e64077272..aa7d512b3dbc52352c429c047a1ca0f231010e49 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -401,6 +401,12 @@ def GetParametersFromXML(action):
string_field=test.findtext('nb_healthy')
if (string_field is not None):
CONTAINERS.nb_healthy[0] = int(string_field)
+ string_field=test.findtext('d_retx_th')
+ if (string_field is not None):
+ CONTAINERS.ran_checkers['d_retx_th']= string_field
+ string_field=test.findtext('u_retx_th')
+ if (string_field is not None):
+ CONTAINERS.ran_checkers['u_retx_th']= string_field
elif action == 'PingFromContainer':
string_field = test.findtext('container_name')
@@ -910,7 +916,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
elif action == 'Deploy_Run_PhySim':
PHYSIM.Deploy_PhySim(HTML, RAN)
elif action == 'DeployGenObject':
- CONTAINERS.DeployGenObject(HTML)
+ CONTAINERS.DeployGenObject(HTML, RAN, CiTestObj)
if CONTAINERS.exitStatus==1:
RAN.prematureExit = True
elif action == 'UndeployGenObject':
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index ad360d217979d30bcf982b7279a12f0b30f09938..9bb2a816ab27086a89ac5958aea900152955650e 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -39,6 +39,7 @@ import time
from multiprocessing import Process, Lock, SimpleQueue
import yaml
+
#-----------------------------------------------------------
# OAI Testing modules
#-----------------------------------------------------------
@@ -758,7 +759,7 @@ class RANManagement():
mySSH.command('echo ' + self.eNBPassword + ' | sudo -S rm enb*.log core* enb_*record.raw enb_*.pcap gnb_*.pcap enb_*txt physim_*.log *stats.log *monitor.pickle *monitor*.png ping*.log.png log/*/*.log log/*/*.pcap', '\$', 15)
mySSH.close()
- def AnalyzeLogFile_eNB(self, eNBlogFile, HTML):
+ def AnalyzeLogFile_eNB(self, eNBlogFile, HTML, checkers={}):
if (not os.path.isfile('./' + eNBlogFile)):
return -1
enb_log_file = open('./' + eNBlogFile, 'r')
@@ -815,10 +816,12 @@ class RANManagement():
removing_ue = 0
#count"X2AP-PDU"
x2ap_pdu = 0
- #NSA specific log markers
- nsa_markers ={'SgNBReleaseRequestAcknowledge': [],'FAILURE': [], 'scgFailureInformationNR-r15': [], 'SgNBReleaseRequest': []}
+ #gnb specific log markers
+ gnb_markers ={'SgNBReleaseRequestAcknowledge': [],'FAILURE': [], 'scgFailureInformationNR-r15': [], 'SgNBReleaseRequest': [], 'Detected UL Failure on PUSCH':[]}
nodeB_prefix_found = False
RealTimeProcessingIssue = False
+ DLRetxIssue = False
+ ULRetxIssue = False
line_cnt=0 #log file line counter
for line in enb_log_file.readlines():
@@ -1008,11 +1011,11 @@ class RANManagement():
result = re.search('X2AP-PDU', str(line))
if result is not None:
x2ap_pdu += 1
- #nsa markers logging
- for k in nsa_markers:
+ #gnb markers logging
+ for k in gnb_markers:
result = re.search(k, line)
if result is not None:
- nsa_markers[k].append(line_cnt)
+ gnb_markers[k].append(line_cnt)
enb_log_file.close()
@@ -1096,31 +1099,77 @@ class RANManagement():
htmlMsg = statMsg+'\n'
logging.debug(statMsg)
htmleNBFailureMsg += htmlMsg
- #nsa markers
+ #gnb markers
statMsg = 'logfile line count = ' + str(line_cnt)
htmlMsg = statMsg+'\n'
logging.debug(statMsg)
htmleNBFailureMsg += htmlMsg
- if len(nsa_markers['SgNBReleaseRequestAcknowledge'])!=0:
- statMsg = 'SgNBReleaseRequestAcknowledge = ' + str(len(nsa_markers['SgNBReleaseRequestAcknowledge'])) + ' occurences , starting line ' + str(nsa_markers['SgNBReleaseRequestAcknowledge'][0])
+ if len(gnb_markers['SgNBReleaseRequestAcknowledge'])!=0:
+ statMsg = 'SgNBReleaseRequestAcknowledge = ' + str(len(gnb_markers['SgNBReleaseRequestAcknowledge'])) + ' occurences , starting line ' + str(gnb_markers['SgNBReleaseRequestAcknowledge'][0])
else:
- statMsg = 'SgNBReleaseRequestAcknowledge = ' + str(len(nsa_markers['SgNBReleaseRequestAcknowledge'])) + ' occurences'
+ statMsg = 'SgNBReleaseRequestAcknowledge = ' + str(len(gnb_markers['SgNBReleaseRequestAcknowledge'])) + ' occurences'
htmlMsg = statMsg+'\n'
logging.debug(statMsg)
htmleNBFailureMsg += htmlMsg
- statMsg = 'FAILURE = ' + str(len(nsa_markers['FAILURE'])) + ' occurences'
+ statMsg = 'FAILURE = ' + str(len(gnb_markers['FAILURE'])) + ' occurences'
+ htmlMsg = statMsg+'\n'
+ logging.debug(statMsg)
+ htmleNBFailureMsg += htmlMsg
+ statMsg = 'Detected UL Failure on PUSCH = ' + str(len(gnb_markers['Detected UL Failure on PUSCH'])) + ' occurences'
htmlMsg = statMsg+'\n'
logging.debug(statMsg)
htmleNBFailureMsg += htmlMsg
- #ulsch and dlsch statistics
+ #ulsch and dlsch statistics and checkers
+ #print statistics into html
if len(dlsch_ulsch_stats)!=0: #check if dictionary is not empty
+ #for each dictionary key, generate the msg for html as information
statMsg=''
- for key in dlsch_ulsch_stats: #for each dictionary key
+ for key in dlsch_ulsch_stats:
statMsg += dlsch_ulsch_stats[key] + '\n'
logging.debug(dlsch_ulsch_stats[key])
htmleNBFailureMsg += statMsg
+ #checker
+ if (len(dlsch_ulsch_stats)!=0) and (len(checkers)!=0):
+ if 'd_retx_th' in checkers:
+ checkers['d_retx_th'] = [float(x) for x in checkers['d_retx_th'].split(',')]
+ dlsch_checker_status = list(0 for i in checkers['d_retx_th'])#status 0 / -1
+ d_perc_retx = list(0 for i in checkers['d_retx_th'])#results in %
+
+ if 'u_retx_th' in checkers:
+ checkers['u_retx_th'] = [float(x) for x in checkers['u_retx_th'].split(',')]
+ ulsch_checker_status = list(0 for i in checkers['u_retx_th'])
+ u_perc_retx = list(0 for i in checkers['u_retx_th'])
+
+ #ul and dl retransmissions checkers
+ #NOTICE: DL and UL regex are different
+
+ if ('dlsch_rounds' in dlsch_ulsch_stats) and ('d_retx_th' in checkers):
+ tmp=re.match(r'^.*dlsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+dlsch_errors\s+(\d+)',dlsch_ulsch_stats['dlsch_rounds'])
+ if tmp is not None :
+ #captures the different groups from the regex
+ retx_data=[float(x) for x in tmp.groups()]
+ for i in range(0,len(d_perc_retx)):
+ #case where numerator > denumerator with denum ==0 is disregarded, cannot hapen in principle, will lead to 0%
+ d_perc_retx[i] = 0 if (retx_data[i] == 0) else 100*retx_data[i+1]/retx_data[i]
+ #treating % > 100 , % > requirement
+ if (d_perc_retx[i] > 100) or (d_perc_retx[i] > checkers['d_retx_th'][i]): dlsch_checker_status[i] = -1
+ if -1 in dlsch_checker_status:
+ DLRetxIssue = True
+
+ if ('ulsch_rounds' in dlsch_ulsch_stats) and ('u_retx_th' in checkers):
+ tmp=re.match(r'^.*ulsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+.*,\s+ulsch_errors\s+(\d+)',dlsch_ulsch_stats['ulsch_rounds'])
+ if tmp is not None :
+ retx_data=[float(x) for x in tmp.groups()]
+ for i in range(0,len(d_perc_retx)):
+ u_perc_retx[i] = 0 if (retx_data[i] == 0) else 100*retx_data[i+1]/retx_data[i]
+ if (u_perc_retx[i] > 100) or (u_perc_retx[i] > checkers['u_retx_th'][i]): ulsch_checker_status[i] = -1
+ if -1 in ulsch_checker_status:
+ ULRetxIssue = True
+
+
+
#real time statistics
datalog_rt_stats['Data']={}
if len(real_time_stats)!=0: #check if dictionary is not empty
@@ -1158,18 +1207,34 @@ class RANManagement():
htmlMsg = statMsg+'\n'
logging.debug(statMsg)
htmleNBFailureMsg += htmlMsg
- if len(nsa_markers['SgNBReleaseRequest'])!=0:
- statMsg = 'SgNBReleaseRequest = ' + str(len(nsa_markers['SgNBReleaseRequest'])) + ' occurences , starting line ' + str(nsa_markers['SgNBReleaseRequest'][0])
+ if len(gnb_markers['SgNBReleaseRequest'])!=0:
+ statMsg = 'SgNBReleaseRequest = ' + str(len(gnb_markers['SgNBReleaseRequest'])) + ' occurences , starting line ' + str(gnb_markers['SgNBReleaseRequest'][0])
else:
- statMsg = 'SgNBReleaseRequest = ' + str(len(nsa_markers['SgNBReleaseRequest'])) + ' occurences'
+ statMsg = 'SgNBReleaseRequest = ' + str(len(gnb_markers['SgNBReleaseRequest'])) + ' occurences'
htmlMsg = statMsg+'\n'
logging.debug(statMsg)
htmleNBFailureMsg += htmlMsg
- statMsg = 'scgFailureInformationNR-r15 = ' + str(len(nsa_markers['scgFailureInformationNR-r15'])) + ' occurences'
+ statMsg = 'scgFailureInformationNR-r15 = ' + str(len(gnb_markers['scgFailureInformationNR-r15'])) + ' occurences'
htmlMsg = statMsg+'\n'
logging.debug(statMsg)
htmleNBFailureMsg += htmlMsg
+ if DLRetxIssue:
+ retx_checker_status_str = ''
+ for status in dlsch_checker_status : retx_checker_status_str+=str(status)+ ' '
+ logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with too many retransmissions / errors issue in DL ! \u001B[0m')
+ logging.debug('\u001B[1;37;41m Status : ' + retx_checker_status_str + ' \u001B[0m')
+ htmleNBFailureMsg += 'Fail due to retransmissions / errors issue in DL, status : ' + retx_checker_status_str + '\n'
+ global_status = CONST.ENB_RETX_ISSUE
+
+ if ULRetxIssue:
+ retx_checker_status_str = ''
+ for status in ulsch_checker_status : retx_checker_status_str+=str(status)+ ' '
+ logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with too many retransmissions / errors issue in UL ! \u001B[0m')
+ logging.debug('\u001B[1;37;41m Status : ' + retx_checker_status_str + ' \u001B[0m')
+ htmleNBFailureMsg += 'Fail due to retransmissions / errors issue in UL, status : ' + retx_checker_status_str + '\n'
+ global_status = CONST.ENB_RETX_ISSUE
+
if RealTimeProcessingIssue:
logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with real time processing issue! \u001B[0m')
htmleNBFailureMsg += 'Fail due to real time processing issue\n'
diff --git a/ci-scripts/reportTestLocally.sh b/ci-scripts/reportTestLocally.sh
index 6ef6b2e254e80f55a60b0706e5555b7f61708f54..d22bfe177a88fa99b271067dc2337b00eb080f81 100755
--- a/ci-scripts/reportTestLocally.sh
+++ b/ci-scripts/reportTestLocally.sh
@@ -756,7 +756,7 @@ function report_test {
EPC_CONFIGS=("noS1")
TRANS_MODES=("tdd")
FR_MODE=("SA")
- BW_CASES=(106)
+ BW_CASES=(106 24)
for CN_CONFIG in ${EPC_CONFIGS[@]}
do
for TMODE in ${TRANS_MODES[@]}
diff --git a/ci-scripts/runTestOnVM.sh b/ci-scripts/runTestOnVM.sh
index 8be4a47bfa13219686b8bce3c105363f81f44b32..b5abb5ff45257157c0a51fab84527a6ede4eb261 100755
--- a/ci-scripts/runTestOnVM.sh
+++ b/ci-scripts/runTestOnVM.sh
@@ -1401,8 +1401,11 @@ function start_rf_sim_nr_ue {
elif [ $LOC_RA_SA_TEST -eq 1 ] #RA test => use --do-ra option
then
echo "echo \"./nr-uesoftmodem --rfsim --do-ra --log_config.global_log_options level,nocolor,time --rrc_config_path /home/ubuntu/tmp/cmake_targets/ran_build/build/\" > ./my-nr-softmodem-run.sh " >> $1
- else #SA test => use --sa option
+ elif [ $LOC_RA_SA_TEST -eq 2 ] #SA test 106PRB => use --sa option
+ then
echo "echo \"./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --sa --log_config.global_log_options level,nocolor,time\" > ./my-nr-softmodem-run.sh " >> $1
+ else # -eq 3 SA test 24PRB
+ echo "echo \"./nr-uesoftmodem -r 24 -s 24 --numerology 1 --band 78 -C 3604320000 --rfsim --sa --log_config.global_log_options level,nocolor,time\" > ./my-nr-softmodem-run.sh " >> $1
fi
fi
echo "chmod 775 ./my-nr-softmodem-run.sh" >> $1
@@ -2270,7 +2273,7 @@ function run_test_on_vm {
mkdir --parents $ARCHIVES_LOC
echo "############################################################"
- echo "SA TEST"
+ echo "SA TEST 106PRB"
echo "############################################################"
#SA test, attention : has a different config file from the rest of the test
CN_CONFIG="noS1"
@@ -2305,7 +2308,7 @@ function run_test_on_vm {
echo "${CN_CONFIG} : Starting the NR-UE"
echo "############################################################"
CURRENT_NR_UE_LOG_FILE=tdd_${PRB}prb_${CN_CONFIG}_ue_sa_test.log
- #last argument = 2 is to enable --sa for SA test
+ #last argument = 2 is to enable --sa for SA test for 106PRB
start_rf_sim_nr_ue $NR_UE_VM_CMDS $NR_UE_VM_IP_ADDR $GNB_VM_IP_ADDR $CURRENT_NR_UE_LOG_FILE $PRB $FREQUENCY $S1_NOS1_CFG 2
if [ $NR_UE_SYNC -eq 0 ]
then
@@ -2340,9 +2343,94 @@ function run_test_on_vm {
echo "SA test NOT OK"
echo "try_cnt = " $try_cnt
try_cnt=$((try_cnt+1))
+ SA_106PRB_STATUS = -1
+ else
+ echo "SA test OK"
+ try_cnt=$((try_cnt+10))
+ SA_106PRB_STATUS = 0
+ fi
+ done
+ ########### end SA test
+
+ sleep 30
+
+
+ echo "############################################################"
+ echo "SA TEST 24PRB"
+ echo "############################################################"
+ #SA test, attention : has a different config file from the rest of the test
+ CN_CONFIG="noS1"
+ CONF_FILE=gnb.sa.band78.fr1.24PRB.usrpb210.conf
+ S1_NOS1_CFG=0
+ PRB=24
+ FREQUENCY=3600
+
+ if [ ! -d $ARCHIVES_LOC ]
+ then
+ mkdir --parents $ARCHIVES_LOC
+ fi
+
+ local try_cnt=0
+
+ ######### start of SA TEST loop
+ while [ $try_cnt -lt 5 ] #5 because it hardly succeed within CI
+ do
+
+ SYNC_STATUS=0
+ SA_STATUS=0
+ rm -f $ARCHIVES_LOC/tdd_${PRB}prb_${CN_CONFIG}*sa_test.log
+
+ echo "############################################################"
+ echo "${CN_CONFIG} : Starting the gNB"
+ echo "############################################################"
+ CURRENT_GNB_LOG_FILE=tdd_${PRB}prb_${CN_CONFIG}_gnb_sa_test.log
+ #last argument = 2 is to enable --sa for SA test
+ start_rf_sim_gnb $GNB_VM_CMDS "$GNB_VM_IP_ADDR" $CURRENT_GNB_LOG_FILE $PRB $CONF_FILE $S1_NOS1_CFG 2
+
+ echo "############################################################"
+ echo "${CN_CONFIG} : Starting the NR-UE"
+ echo "############################################################"
+ CURRENT_NR_UE_LOG_FILE=tdd_${PRB}prb_${CN_CONFIG}_ue_sa_test.log
+ #last argument = 3 is to enable --sa for SA test for 24PRB
+ start_rf_sim_nr_ue $NR_UE_VM_CMDS $NR_UE_VM_IP_ADDR $GNB_VM_IP_ADDR $CURRENT_NR_UE_LOG_FILE $PRB $FREQUENCY $S1_NOS1_CFG 3
+ if [ $NR_UE_SYNC -eq 0 ]
+ then
+ echo "Problem w/ gNB and NR-UE not syncing"
+ terminate_enb_ue_basic_sim $NR_UE_VM_CMDS $NR_UE_VM_IP_ADDR 2
+ terminate_enb_ue_basic_sim $GNB_VM_CMDS $GNB_VM_IP_ADDR 1
+ scp -o StrictHostKeyChecking=no ubuntu@$GNB_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC
+ scp -o StrictHostKeyChecking=no ubuntu@$NR_UE_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_NR_UE_LOG_FILE $ARCHIVES_LOC
+ SYNC_STATUS=-1
+ try_cnt=$((try_cnt+1))
+ continue
+ fi
+
+ echo "############################################################"
+ echo "${CN_CONFIG} : Terminate gNB/NR-UE simulators"
+ echo "############################################################"
+ sleep 20
+ terminate_enb_ue_basic_sim $NR_UE_VM_CMDS $NR_UE_VM_IP_ADDR 2
+ terminate_enb_ue_basic_sim $GNB_VM_CMDS $GNB_VM_IP_ADDR 1
+ scp -o StrictHostKeyChecking=no ubuntu@$GNB_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC
+ scp -o StrictHostKeyChecking=no ubuntu@$NR_UE_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_NR_UE_LOG_FILE $ARCHIVES_LOC
+
+ #check SA markers in gNB and NR UE log files
+ echo "############################################################"
+ echo "${CN_CONFIG} : Checking SA on gNB / NR-UE"
+ echo "############################################################"
+
+ # Proper check to be done when SA test is working!
+ check_sa_result $ARCHIVES_LOC/$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC/$CURRENT_NR_UE_LOG_FILE
+ if [ $SA_STATUS -ne 0 ]
+ then
+ echo "SA test NOT OK"
+ echo "try_cnt = " $try_cnt
+ try_cnt=$((try_cnt+1))
+ SA_24PRB_STATUS = -1
else
echo "SA test OK"
try_cnt=$((try_cnt+10))
+ SA_24PRB_STATUS = 0
fi
done
########### end SA test
@@ -2351,6 +2439,9 @@ function run_test_on_vm {
+
+
+
echo "############################################################"
echo "RA TEST FR2"
echo "############################################################"
@@ -2661,7 +2752,8 @@ function run_test_on_vm {
echo "Checking run status"
echo "############################################################"
- if [ $SA_STATUS -ne 0 ]; then NR_STATUS=-1; fi
+ if [ $SA_106PRB_STATUS -ne 0 ]; then NR_STATUS=-1; fi
+ if [ $SA_24PRB_STATUS -ne 0 ]; then NR_STATUS=-1; fi
if [ $RA_FR2_STATUS -ne 0 ]; then NR_STATUS=-1; fi
if [ $RA_FR1_STATUS -ne 0 ]; then NR_STATUS=-1; fi
if [ $SYNC_STATUS -ne 0 ]; then NR_STATUS=-1; fi
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
index fd254f185677c81ee189f636dbef00b7eb3bbf21..a598b2bdc15cf9e63b5a72bd7bb758cf42785cbb 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
@@ -66,8 +66,8 @@
<class>DeployGenObject</class>
<desc>Deploy OAI 4G CoreNetwork</desc>
<yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
- <services>oai_hss oai_mme oai_spgwc oai_spgwu trf_gen</services>
- <nb_healthy>6</nb_healthy>
+ <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
+ <nb_healthy>7</nb_healthy>
</testCase>
<testCase id="000013">
@@ -75,15 +75,15 @@
<desc>Deploy OAI 4G eNB RF sim (FDD 05MHz)</desc>
<yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
<services>enb</services>
- <nb_healthy>7</nb_healthy>
+ <nb_healthy>8</nb_healthy>
</testCase>
<testCase id="000014">
<class>DeployGenObject</class>
- <desc>Deploy OAI 4G NR-UE RF sim (FDD 05MHz)</desc>
+ <desc>Deploy OAI 4G LTE-UE RF sim (FDD 05MHz)</desc>
<yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
<services>oai_ue0</services>
- <nb_healthy>8</nb_healthy>
+ <nb_healthy>9</nb_healthy>
</testCase>
<testCase id="020011">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
index 2ff9461b9361d490d8574d0a89034444449db4c0..07ea358ad538904ac0f24a621747967637c892e9 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
@@ -60,7 +60,7 @@
<testCase id="000014">
<class>DeployGenObject</class>
- <desc>Deploy OAI 4G NR-UE RF sim (FDD 05MHz)</desc>
+ <desc>Deploy OAI 4G LTE-UE RF sim (FDD 05MHz)</desc>
<yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
<services>oai_ue0</services>
<nb_healthy>2</nb_healthy>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
index f00e277c36f3bb7e91ad96f4737c895017323967..29acfa3b09f1e39bfd089b174f9c4a6364cfb726 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
@@ -66,8 +66,8 @@
<class>DeployGenObject</class>
<desc>Deploy OAI 4G CoreNetwork</desc>
<yaml_path>yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
- <services>oai_hss oai_mme oai_spgwc oai_spgwu trf_gen</services>
- <nb_healthy>6</nb_healthy>
+ <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
+ <nb_healthy>7</nb_healthy>
</testCase>
<testCase id="000013">
@@ -75,15 +75,15 @@
<desc>Deploy OAI 4G eNB RF sim (FDD 10MHz)</desc>
<yaml_path>yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
<services>enb</services>
- <nb_healthy>7</nb_healthy>
+ <nb_healthy>8</nb_healthy>
</testCase>
<testCase id="000014">
<class>DeployGenObject</class>
- <desc>Deploy OAI 4G NR-UE RF sim (FDD 10MHz)</desc>
+ <desc>Deploy OAI 4G LTE-UE RF sim (FDD 10MHz)</desc>
<yaml_path>yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
<services>oai_ue0</services>
- <nb_healthy>8</nb_healthy>
+ <nb_healthy>9</nb_healthy>
</testCase>
<testCase id="020011">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
index 52e1ac7de18ee874300c685e2c0ae62282556e81..74f712ebdaab002b1175ff224af8947cb77ae1a8 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
@@ -66,8 +66,8 @@
<class>DeployGenObject</class>
<desc>Deploy OAI 4G CoreNetwork</desc>
<yaml_path>yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
- <services>oai_hss oai_mme oai_spgwc oai_spgwu trf_gen</services>
- <nb_healthy>6</nb_healthy>
+ <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
+ <nb_healthy>7</nb_healthy>
</testCase>
<testCase id="000013">
@@ -75,15 +75,15 @@
<desc>Deploy OAI 4G eNB RF sim (FDD 20MHz)</desc>
<yaml_path>yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
<services>enb</services>
- <nb_healthy>7</nb_healthy>
+ <nb_healthy>8</nb_healthy>
</testCase>
<testCase id="000014">
<class>DeployGenObject</class>
- <desc>Deploy OAI 4G NR-UE RF sim (FDD 20MHz)</desc>
+ <desc>Deploy OAI 4G LTE-UE RF sim (FDD 20MHz)</desc>
<yaml_path>yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
<services>oai_ue0</services>
- <nb_healthy>8</nb_healthy>
+ <nb_healthy>9</nb_healthy>
</testCase>
<testCase id="020011">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
index cdaee430efc3c092a5cfd60cb95e94d10c0c7975..aa70db1fed4331e9a4a22830c6ce933d19367d6b 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
@@ -81,7 +81,7 @@
<testCase id="000014">
<class>DeployGenObject</class>
- <desc>Deploy OAI 4G NR-UE RF sim (TDD 05MHz)</desc>
+ <desc>Deploy OAI 4G LTE-UE RF sim (TDD 05MHz)</desc>
<yaml_path>yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
<services>oai_ue0</services>
<nb_healthy>8</nb_healthy>
diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
index 501f2fe46ff6043468c0b3e7e940bfb8ee36932e..05b20afed3a568c4a48d4292a91642f20f63ef29 100644
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -100,7 +100,7 @@
<server_container_name>rfsim5g-oai-nr-ue</server_container_name>
<client_container_name>rfsim5g-oai-ext-dn</client_container_name>
<server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
- <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 200K</client_options>
+ <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
</testCase>
<testCase id="030022">
@@ -109,13 +109,15 @@
<server_container_name>rfsim5g-oai-ext-dn</server_container_name>
<client_container_name>rfsim5g-oai-nr-ue</client_container_name>
<server_options>-u -i 1 -s</server_options>
- <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 5K</client_options>
+ <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 1M</client_options>
</testCase>
<testCase id="100021">
<class>UndeployGenObject</class>
<desc>Undeploy all OAI 5G stack</desc>
<yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
+ <d_retx_th>5,0,0,0</d_retx_th>
+ <u_retx_th>5,0,0,0</u_retx_th>
</testCase>
</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
new file mode 100644
index 0000000000000000000000000000000000000000..61a2af9e54b63064fc1e52270613dc7ff3a492bd
--- /dev/null
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -0,0 +1,118 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+ contact@openairinterface.org
+
+-->
+<testCaseList>
+ <htmlTabRef>rfsim-5gnr-fdd</htmlTabRef>
+ <htmlTabName>Testing 5G NR RF sim - Monolithic FDD gNB</htmlTabName>
+ <htmlTabIcon>wrench</htmlTabIcon>
+ <repeatCount>4</repeatCount>
+ <TestCaseRequestedList>
+ 100011
+ 000010
+ 000011
+ 000012
+ 000013
+ 020011
+ 020012
+ 100011
+ </TestCaseRequestedList>
+<!-- Not done yet because of code instability
+ 030011
+ 030012
+-->
+ <TestCaseExclusionList></TestCaseExclusionList>
+
+ <testCase id="000010">
+ <class>DeployGenObject</class>
+ <desc>Deploy MySql Database</desc>
+ <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
+ <services>mysql</services>
+ <nb_healthy>1</nb_healthy>
+ </testCase>
+
+ <testCase id="000011">
+ <class>DeployGenObject</class>
+ <desc>Deploy OAI 5G CoreNetwork</desc>
+ <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
+ <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+ <nb_healthy>6</nb_healthy>
+ </testCase>
+
+ <testCase id="000012">
+ <class>DeployGenObject</class>
+ <desc>Deploy OAI 5G gNB RF sim SA</desc>
+ <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
+ <services>oai-gnb</services>
+ <nb_healthy>7</nb_healthy>
+ </testCase>
+
+ <testCase id="000013">
+ <class>DeployGenObject</class>
+ <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+ <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
+ <services>oai-nr-ue</services>
+ <nb_healthy>8</nb_healthy>
+ </testCase>
+
+ <testCase id="020011">
+ <class>PingFromContainer</class>
+ <desc>Ping ext-dn from NR-UE</desc>
+ <container_name>rfsim5g-oai-nr-ue</container_name>
+ <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
+ <loss_threshold>5</loss_threshold>
+ </testCase>
+
+ <testCase id="020012">
+ <class>PingFromContainer</class>
+ <desc>Ping NR-UE from ext-dn</desc>
+ <container_name>rfsim5g-oai-ext-dn</container_name>
+ <options>-c 20 12.1.1.2</options>
+ <loss_threshold>5</loss_threshold>
+ </testCase>
+
+ <testCase id="030011">
+ <class>IperfFromContainer</class>
+ <desc>Iperf UDP Downlink</desc>
+ <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
+ <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
+ <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
+ <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
+ </testCase>
+
+ <testCase id="030012">
+ <class>IperfFromContainer</class>
+ <desc>Iperf UDP Uplink</desc>
+ <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
+ <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
+ <server_options>-u -i 1 -s</server_options>
+ <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 1M</client_options>
+ </testCase>
+
+ <testCase id="100011">
+ <class>UndeployGenObject</class>
+ <desc>Undeploy all OAI 5G stack</desc>
+ <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
+ <d_retx_th>5,0,0,0</d_retx_th>
+ <u_retx_th>5,0,0,0</u_retx_th>
+ </testCase>
+
+</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d960949f7d2a1befbfeb8f8381c7be8f3769f31f
--- /dev/null
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml
@@ -0,0 +1,38 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+ contact@openairinterface.org
+
+-->
+<testCaseList>
+ <htmlTabRef>rfsim-5gnr-fdd-down</htmlTabRef>
+ <htmlTabName>CleanUp 5G RF - Monolithic FDD gNB</htmlTabName>
+ <htmlTabIcon>trash</htmlTabIcon>
+ <TestCaseRequestedList>
+ 100012
+ </TestCaseRequestedList>
+ <TestCaseExclusionList></TestCaseExclusionList>
+
+ <testCase id="100012">
+ <class>UndeployGenObject</class>
+ <desc>Undeploy all OAI 5G stack</desc>
+ <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
+ </testCase>
+
+</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml
index d1114616a85e6815a53d3bae280a2914a6973662..bab7f9637ad3ef6b187cec5e9edfd80deefca6d4 100644
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -21,8 +21,8 @@
-->
<testCaseList>
- <htmlTabRef>rfsim-5gnr</htmlTabRef>
- <htmlTabName>Testing 5G NR RF sim - Monolithic gNB</htmlTabName>
+ <htmlTabRef>rfsim-5gnr-tdd</htmlTabRef>
+ <htmlTabName>Testing 5G NR RF sim - Monolithic TDD gNB</htmlTabName>
<htmlTabIcon>wrench</htmlTabIcon>
<repeatCount>4</repeatCount>
<TestCaseRequestedList>
@@ -109,6 +109,8 @@
<class>UndeployGenObject</class>
<desc>Undeploy all OAI 5G stack</desc>
<yaml_path>yaml_files/5g_rfsimulator</yaml_path>
+ <d_retx_th>5,0,0,0</d_retx_th>
+ <u_retx_th>5,0,0,0</u_retx_th>
</testCase>
</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_down.xml b/ci-scripts/xml_files/container_5g_rfsim_down.xml
index 9acc3f85a1b8b2dce671ccf468e62900af1d5b20..b369b1fad8a96ab5457113695c3f56eaa719a5de 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_down.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_down.xml
@@ -22,7 +22,7 @@
-->
<testCaseList>
<htmlTabRef>rfsim-5gnr-down</htmlTabRef>
- <htmlTabName>CleanUp 5G RF - Monolithic gNB</htmlTabName>
+ <htmlTabName>CleanUp 5G RF - Monolithic TDD gNB</htmlTabName>
<htmlTabIcon>trash</htmlTabIcon>
<TestCaseRequestedList>
100002
diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
index 5c53bf5eed4de0b43ae07e18fb3f89cfd4821a2c..2476a75427d41e2f62c199a570510bebbac595a1 100644
--- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
+++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
@@ -36,6 +36,7 @@
000002
070000
070001
+ 070002
000001
010002
080001
@@ -132,6 +133,16 @@
<iperf_profile>single-ue</iperf_profile>
</testCase>
+ <testCase id="070002">
+ <class>Iperf</class>
+ <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
+ <iperf_args>-t 10 --bidir</iperf_args>
+ <direction>BIDIR</direction>
+ <id>nrmodule2_quectel</id>
+ <iperf_profile>single-ue</iperf_profile>
+ </testCase>
+
+
<testCase id="080000">
<class>Terminate_eNB</class>
diff --git a/ci-scripts/xml_files/fr1_nsa_quectel.xml b/ci-scripts/xml_files/fr1_nsa_quectel.xml
index 574286fbc26e7fc068f2f10a3cd66329331063d0..55f6f4376ea275760a7c41aa5e7856a5c1860548 100644
--- a/ci-scripts/xml_files/fr1_nsa_quectel.xml
+++ b/ci-scripts/xml_files/fr1_nsa_quectel.xml
@@ -37,8 +37,6 @@
070003
070002
000001
- 070002
- 000001
050000
050001
010002
@@ -157,14 +155,6 @@
<iperf_profile>single-ue</iperf_profile>
</testCase>
- <testCase id="070002">
- <class>Iperf</class>
- <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
- <iperf_args>-t 10 --bidir</iperf_args>
- <direction>BIDIR</direction>
- <id>idefix</id>
- <iperf_profile>single-ue</iperf_profile>
- </testCase>
<testCase id="080000">
<class>Terminate_eNB</class>
diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
index 55852ad79be335cb9a06f6f328490a09e4b3684b..bfa2208d3dc426cc60edf8cebda52a7f3baf0ead 100644
--- a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
@@ -42,7 +42,7 @@
<class>Initialize_OAI_UE</class>
<desc>Initialize OAI UE (N310)</desc>
<air_interface>nr</air_interface>
- <Initialize_OAI_UE_args>--sa -O ../../../ci-scripts/conf_files/ue.sa.conf --usrp-args "mgmt_addr=192.168.18.241,second_addr=192.168.10.2" --numerology 1 -r 106 --band 78 -C 3319680000 --nokrnmod 1 --ue-txgain 0 --ue-rxgain 70 --ue-fo-compensation --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+ <Initialize_OAI_UE_args>--sa -O ../../../ci-scripts/conf_files/ue.sa.conf --usrp-args "mgmt_addr=192.168.18.241,addr=192.168.10.2" --numerology 1 -r 106 --band 78 -C 3319680000 --nokrnmod 1 --ue-txgain 0 --ue-rxgain 70 --ue-fo-compensation --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
</testCase>
<testCase id="010002">
diff --git a/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml b/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml
index 6cb7b2883b0a10fbc492188d48c907a61b7b3f9f..11c4abce1b2f0edcf7bac36f34154fe4f2c63d2f 100644
--- a/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml
+++ b/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml
@@ -96,7 +96,7 @@
<id>nrmodule2_quectel</id>
<ping_args>-c 100 -s 1024 -i 0,2</ping_args>
<ping_packetloss_threshold>1</ping_packetloss_threshold>
- <ping_rttavg_threshold>30</ping_rttavg_threshold>
+ <ping_rttavg_threshold>40</ping_rttavg_threshold>
</testCase>
diff --git a/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml b/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml
index e6520fc5fcd4b7e73099de64ad8d62da744bec47..714cf51a9b5641ed7118fe57a0aa0eb5ca4d079b 100644
--- a/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml
+++ b/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml
@@ -96,7 +96,7 @@
<id>nrmodule2_quectel</id>
<ping_args>-c 100 -s 1024 -i 0,2</ping_args>
<ping_packetloss_threshold>1</ping_packetloss_threshold>
- <ping_rttavg_threshold>30</ping_rttavg_threshold>
+ <ping_rttavg_threshold>40</ping_rttavg_threshold>
</testCase>
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md
index b2a7f8e30cc74622d02435986513aa01863c04da..400559d26988ec1dd5d04aee886ad89e225ba493 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md
@@ -48,8 +48,9 @@ Now pull images.
```bash
$ docker pull cassandra:2.1
+$ docker pull redis:6.0.5
$ docker pull rdefosseoai/oai-hss:latest
-$ docker pull rdefosseoai/oai-mme:latest
+$ docker pull rdefosseoai/magma-mme:latest
$ docker pull rdefosseoai/oai-spgwc:latest
$ docker pull rdefosseoai/oai-spgwu-tiny:latest
@@ -57,13 +58,15 @@ $ docker pull rdefosseoai/oai-enb:develop
$ docker pull rdefosseoai/oai-lte-ue:develop
```
+If the `redis` tag is not available, pick the newest available `6.0.x` tag at [Docker Hub Redis Tags](https://hub.docker.com/_/redis?tab=tags).
+
And **re-tag** them for tutorials' docker-compose file to work.
```bash
$ docker image tag rdefosseoai/oai-spgwc:latest oai-spgwc:latest
$ docker image tag rdefosseoai/oai-hss:latest oai-hss:latest
$ docker image tag rdefosseoai/oai-spgwu-tiny:latest oai-spgwu-tiny:latest
-$ docker image tag rdefosseoai/oai-mme:latest oai-mme:latest
+$ docker image tag rdefosseoai/magma-mme:latest magma-mme:latest
$ docker image tag rdefosseoai/oai-enb:develop oai-enb:develop
$ docker image tag rdefosseoai/oai-lte-ue:develop oai-lte-ue:develop
@@ -81,14 +84,14 @@ How to build the Traffic-Generator image is explained [here](https://github.com/
**Just `docker-compose up -d` WILL NOT WORK!**
-All the following commands **SHALL** be run from the `ci-scripts/yaml_files/4g_rfsimulator` folder.
+All the following commands **SHALL** be run from the `ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz` folder.
## 2.1. Deploy and Configure Cassandra Database ##
It is very crutial that the Cassandra DB is fully configured before you do anything else!
```bash
-$ cd ci-scripts/yaml_files/4g_rfsimulator
+$ cd ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz
$ docker-compose up -d db_init
Creating network "rfsim4g-oai-private-net" with the default driver
Creating network "rfsim4g-oai-public-net" with the default driver
@@ -128,11 +131,12 @@ $ sudo tshark -i rfsim4g-public -f 'port 3868 or port 2123 or port 36412 or port
## 2.2. Deploy OAI CN4G containers ##
```bash
-$ docker-compose up -d oai_mme oai_spgwu trf_gen
+$ docker-compose up -d magma_mme oai_spgwu trf_gen
rfsim4g-cassandra is up-to-date
-Creating rfsim4g-trf-gen ... done
+Creating rfsim4g-trf-gen ... done
+Creating rfsim4g-redis ... done
Creating rfsim4g-oai-hss ... done
-Creating rfsim4g-oai-mme ... done
+Creating rfsim4g-magma-mme ... done
Creating rfsim4g-oai-spgwc ... done
Creating rfsim4g-oai-spgwu-tiny ... done
```
@@ -144,11 +148,12 @@ $ docker-compose ps -a
Name Command State Ports
-------------------------------------------------------------------------------------------------------------------------
rfsim4g-cassandra docker-entrypoint.sh cassa ... Up (healthy) 7000/tcp, 7001/tcp, 7199/tcp, 9042/tcp, 9160/tcp
-rfsim4g-oai-hss /openair-hss/bin/entrypoin ... Up (healthy) 5868/tcp, 9042/tcp, 9080/tcp, 9081/tcp
-rfsim4g-oai-mme /openair-mme/bin/entrypoin ... Up (healthy) 2123/udp, 3870/tcp, 5870/tcp
-rfsim4g-oai-spgwc /openair-spgwc/bin/entrypo ... Up (healthy) 2123/udp, 8805/udp
-rfsim4g-oai-spgwu-tiny /openair-spgwu-tiny/bin/en ... Up (healthy) 2152/udp, 8805/udp
-rfsim4g-trf-gen /bin/bash -c ip route add ... Up (healthy)
+rfsim4g-magma-mme /bin/bash -c /magma-mme/bi ... Up (healthy) 2123/udp, 3870/tcp, 5870/tcp
+rfsim4g-oai-hss /openair-hss/bin/entrypoin ... Up (healthy) 5868/tcp, 9042/tcp, 9080/tcp, 9081/tcp
+rfsim4g-oai-spgwc /openair-spgwc/bin/entrypo ... Up (healthy) 2123/udp, 8805/udp
+rfsim4g-oai-spgwu-tiny /openair-spgwu-tiny/bin/en ... Up (healthy) 2152/udp, 8805/udp
+rfsim4g-redis /bin/bash -c redis-server ... Up (healthy) 6379/tcp
+rfsim4g-trf-gen /bin/bash -c ip route add ... Up (healthy)
```
## 2.3. Deploy OAI eNB in RF simulator mode ##
@@ -165,77 +170,55 @@ $ docker-compose ps -a
Name Command State Ports
-------------------------------------------------------------------------------------------------------------------------
rfsim4g-cassandra docker-entrypoint.sh cassa ... Up (healthy) 7000/tcp, 7001/tcp, 7199/tcp, 9042/tcp, 9160/tcp
-rfsim4g-oai-enb /opt/oai-enb/bin/entrypoin ... Up (healthy) 2152/udp, 36412/udp, 36422/udp
-rfsim4g-oai-hss /openair-hss/bin/entrypoin ... Up (healthy) 5868/tcp, 9042/tcp, 9080/tcp, 9081/tcp
-rfsim4g-oai-mme /openair-mme/bin/entrypoin ... Up (healthy) 2123/udp, 3870/tcp, 5870/tcp
-rfsim4g-oai-spgwc /openair-spgwc/bin/entrypo ... Up (healthy) 2123/udp, 8805/udp
-rfsim4g-oai-spgwu-tiny /openair-spgwu-tiny/bin/en ... Up (healthy) 2152/udp, 8805/udp
-rfsim4g-trf-gen /bin/bash -c ip route add ... Up (healthy)
+rfsim4g-magma-mme /bin/bash -c /magma-mme/bi ... Up (healthy) 2123/udp, 3870/tcp, 5870/tcp
+rfsim4g-oai-enb /opt/oai-enb/bin/entrypoin ... Up (healthy) 2152/udp, 36412/udp, 36422/udp
+rfsim4g-oai-hss /openair-hss/bin/entrypoin ... Up (healthy) 5868/tcp, 9042/tcp, 9080/tcp, 9081/tcp
+rfsim4g-oai-spgwc /openair-spgwc/bin/entrypo ... Up (healthy) 2123/udp, 8805/udp
+rfsim4g-oai-spgwu-tiny /openair-spgwu-tiny/bin/en ... Up (healthy) 2152/udp, 8805/udp
+rfsim4g-redis /bin/bash -c redis-server ... Up (healthy) 6379/tcp
+rfsim4g-trf-gen /bin/bash -c ip route add ... Up (healthy)
```
-Check if the eNB connected to MME:
+Check if the eNB connected to MME: with MAGMA-MME, the logs are not pushed to `stdout` but to a file at `/var/log/mme.log`
```bash
-$ docker logs rfsim4g-oai-mme
+$ docker exec rfsim4g-magma-mme /bin/bash -c "cat /var/log/mme.log"
...
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0039 ======================================= STATISTICS ============================================
-
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0042 | Current Status| Added since last display| Removed since last display |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0048 Connected eNBs | 0 | 0 | 0 |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0054 Attached UEs | 0 | 0 | 0 |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0060 Connected UEs | 0 | 0 | 0 |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0066 Default Bearers| 0 | 0 | 0 |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0072 S1-U Bearers | 0 | 0 | 0 |
-
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0075 ======================================= STATISTICS ============================================
-
-DEBUG SCTP rc/sctp/sctp_primitives_server.c:0469 Client association changed: 0
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0101 ----------------------
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0102 SCTP Status:
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0103 assoc id .....: 675
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0104 state ........: 4
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0105 instrms ......: 2
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0106 outstrms .....: 2
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0108 fragmentation : 1452
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0109 pending data .: 0
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0110 unack data ...: 0
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0111 rwnd .........: 106496
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0112 peer info :
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0114 state ....: 2
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0116 cwnd .....: 4380
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0118 srtt .....: 0
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0120 rto ......: 3000
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0122 mtu ......: 1500
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0123 ----------------------
-DEBUG SCTP rc/sctp/sctp_primitives_server.c:0479 New connection
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0205 ----------------------
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0206 Local addresses:
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0217 - [192.168.61.3]
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0234 ----------------------
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0151 ----------------------
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0152 Peer addresses:
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0163 - [192.168.61.20]
-DEBUG SCTP enair-mme/src/sctp/sctp_common.c:0178 ----------------------
-DEBUG SCTP rc/sctp/sctp_primitives_server.c:0554 SCTP RETURNING!!
-DEBUG SCTP rc/sctp/sctp_primitives_server.c:0547 [675][44] Msg of length 51 received from port 36412, on stream 0, PPID 18
-DEBUG SCTP rc/sctp/sctp_primitives_server.c:0554 SCTP RETURNING!!
-DEBUG S1AP mme/src/s1ap/s1ap_mme_handlers.c:2826 Create eNB context for assoc_id: 675
-DEBUG S1AP mme/src/s1ap/s1ap_mme_handlers.c:0361 S1-Setup-Request macroENB_ID.size 3 (should be 20)
-DEBUG S1AP mme/src/s1ap/s1ap_mme_handlers.c:0321 New s1 setup request incoming from macro eNB id: 00e01
-DEBUG S1AP mme/src/s1ap/s1ap_mme_handlers.c:0423 Adding eNB to the list of served eNBs
-DEBUG S1AP mme/src/s1ap/s1ap_mme_handlers.c:0438 Adding eNB id 3585 to the list of served eNBs
-DEBUG SCTP rc/sctp/sctp_primitives_server.c:0283 [44][675] Sending buffer 0x7f9394009f90 of 27 bytes on stream 0 with ppid 18
-DEBUG SCTP rc/sctp/sctp_primitives_server.c:0296 Successfully sent 27 bytes on stream 0
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0039 ======================================= STATISTICS ============================================
-
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0042 | Current Status| Added since last display| Removed since last display |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0048 Connected eNBs | 1 | 1 | 0 |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0054 Attached UEs | 0 | 0 | 0 |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0060 Connected UEs | 0 | 0 | 0 |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0066 Default Bearers| 0 | 0 | 0 |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0072 S1-U Bearers | 0 | 0 | 0 |
-
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0075 ======================================= STATISTICS ============================================
+000141 Fri Feb 11 09:49:29 2022 7EFFE7BE4700 DEBUG S6A tasks/s6a/s6a_peer.c :0095 Diameter identity of MME: mme.openairinterface.org with length: 24
+000142 Fri Feb 11 09:49:29 2022 7EFFE7BE4700 DEBUG S6A tasks/s6a/s6a_peer.c :0130 S6a peer connection attempt 1 / 8
+000143 Fri Feb 11 09:49:29 2022 7EFFE7BE4700 DEBUG S6A tasks/s6a/s6a_peer.c :0141 Peer hss.openairinterface.org is now connected...
+000144 Fri Feb 11 09:49:29 2022 7EFFEA3E9700 DEBUG MME-AP tasks/mme_app/mme_app_state_mana:0097 Inside get_state with read_from_db 0
+000146 Fri Feb 11 09:49:29 2022 7EFFEA3E9700 DEBUG MME-AP tasks/mme_app/mme_app_main.c :0083 MME APP ZMQ latency: 214.
+000145 Fri Feb 11 09:49:29 2022 7EFFE83E5700 DEBUG S1AP tasks/s1ap/s1ap_mme.c :0121 S1AP ZMQ latency: 146.
+000147 Fri Feb 11 09:50:23 2022 7EFFE83E5700 DEBUG S1AP tasks/s1ap/s1ap_mme.c :0121 S1AP ZMQ latency: 144.
+000148 Fri Feb 11 09:50:23 2022 7EFFE83E5700 DEBUG S1AP tasks/s1ap/s1ap_mme_handlers.c :3775 Create eNB context for assoc_id: 4121
+000149 Fri Feb 11 09:50:23 2022 7EFFE83E5700 DEBUG S1AP tasks/s1ap/s1ap_mme.c :0121 S1AP ZMQ latency: 48.
+000150 Fri Feb 11 09:50:23 2022 7EFFE83E5700 DEBUG S1AP tasks/s1ap/s1ap_mme_handlers.c :0536 New s1 setup request incoming from eNB-rf-sim macro eNB id: 00e01
+000151 Fri Feb 11 09:50:23 2022 7EFFE83E5700 DEBUG S1AP tasks/s1ap/s1ap_mme_handlers.c :0639 Adding eNB with enb_id :3585 to the list of served eNBs
+000152 Fri Feb 11 09:50:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0049 ======================================= STATISTICS ============================================
+
+000153 Fri Feb 11 09:50:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0050 | Current Status|
+000154 Fri Feb 11 09:50:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0053 Attached UEs | 0 |
+000155 Fri Feb 11 09:50:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0056 Connected UEs | 0 |
+000156 Fri Feb 11 09:50:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0059 Connected eNBs | 0 |
+000157 Fri Feb 11 09:50:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0062 Default Bearers| 0 |
+000158 Fri Feb 11 09:50:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0065 S1-U Bearers | 0 |
+
+000159 Fri Feb 11 09:50:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0070 ======================================= STATISTICS ============================================
+
+000160 Fri Feb 11 09:50:28 2022 7EFFEA3E9700 DEBUG MME-AP tasks/mme_app/mme_app_state_mana:0097 Inside get_state with read_from_db 0
+000161 Fri Feb 11 09:51:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0049 ======================================= STATISTICS ============================================
+
+000162 Fri Feb 11 09:51:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0050 | Current Status|
+000163 Fri Feb 11 09:51:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0053 Attached UEs | 0 |
+000164 Fri Feb 11 09:51:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0056 Connected UEs | 0 |
+000165 Fri Feb 11 09:51:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0059 Connected eNBs | 1 |
+000166 Fri Feb 11 09:51:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0062 Default Bearers| 0 |
+000167 Fri Feb 11 09:51:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0065 S1-U Bearers | 0 |
+
+000168 Fri Feb 11 09:51:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0070 ======================================= STATISTICS ============================================
+
+000169 Fri Feb 11 09:51:28 2022 7EFFEA3E9700 DEBUG MME-AP tasks/mme_app/mme_app_state_mana:0097 Inside get_state with read_from_db 0
...
```
@@ -253,14 +236,14 @@ $ docker-compose ps -a
Name Command State Ports
-------------------------------------------------------------------------------------------------------------------------
rfsim4g-cassandra docker-entrypoint.sh cassa ... Up (healthy) 7000/tcp, 7001/tcp, 7199/tcp, 9042/tcp, 9160/tcp
-rfsim4g-oai-enb /opt/oai-enb/bin/entrypoin ... Up (healthy) 2152/udp, 36412/udp, 36422/udp
-rfsim4g-oai-hss /openair-hss/bin/entrypoin ... Up (healthy) 5868/tcp, 9042/tcp, 9080/tcp, 9081/tcp
-rfsim4g-oai-lte-ue0 /opt/oai-lte-ue/bin/entryp ... Up (healthy) 10000/tcp
-rfsim4g-oai-mme /openair-mme/bin/entrypoin ... Up (healthy) 2123/udp, 3870/tcp, 5870/tcp
-rfsim4g-oai-spgwc /openair-spgwc/bin/entrypo ... Up (healthy) 2123/udp, 8805/udp
-rfsim4g-oai-spgwu-tiny /openair-spgwu-tiny/bin/en ... Up (healthy) 2152/udp, 8805/udp
-rfsim4g-trf-gen /bin/bash -c ip route add ... Up (healthy)
-Creating rfsim4g-oai-enb ... done
+rfsim4g-magma-mme /bin/bash -c /magma-mme/bi ... Up (healthy) 2123/udp, 3870/tcp, 5870/tcp
+rfsim4g-oai-enb /opt/oai-enb/bin/entrypoin ... Up (healthy) 2152/udp, 36412/udp, 36422/udp
+rfsim4g-oai-hss /openair-hss/bin/entrypoin ... Up (healthy) 5868/tcp, 9042/tcp, 9080/tcp, 9081/tcp
+rfsim4g-oai-lte-ue0 /opt/oai-lte-ue/bin/entryp ... Up (healthy) 10000/tcp
+rfsim4g-oai-spgwc /openair-spgwc/bin/entrypo ... Up (healthy) 2123/udp, 8805/udp
+rfsim4g-oai-spgwu-tiny /openair-spgwu-tiny/bin/en ... Up (healthy) 2152/udp, 8805/udp
+rfsim4g-redis /bin/bash -c redis-server ... Up (healthy) 6379/tcp
+rfsim4g-trf-gen /bin/bash -c ip route add ... Up (healthy)
```
Making sure the OAI UE is connected:
@@ -268,40 +251,69 @@ Making sure the OAI UE is connected:
```bash
$ docker logs rfsim4g-oai-enb
...
-[RRC] RRCConnectionReconfiguration Encoded 1098 bits (138 bytes)
-[RRC] [eNB 0] Frame 0, Logical Channel DL-DCCH, Generate LTE_RRCConnectionReconfiguration (bytes 138, UE id 617b)
-[RRC] sent RRC_DCCH_DATA_REQ to TASK_PDCP_ENB
-[PDCP] [FRAME 00000][eNB][MOD 00][RNTI 617b][SRB 02] Action ADD LCID 2 (SRB id 2) configured with SN size 5 bits and RLC AM
-[PDCP] [FRAME 00000][eNB][MOD 00][RNTI 617b][DRB 01] Action ADD LCID 3 (DRB id 1) configured with SN size 12 bits and RLC AM
-[SCTP] Successfully sent 46 bytes on stream 1 for assoc_id 676
-[RRC] [FRAME 00000][eNB][MOD 00][RNTI 617b] UE State = RRC_RECONFIGURED (default DRB, xid 0)
-[PDCP] [FRAME 00000][eNB][MOD 00][RNTI 617b][SRB 02] Action MODIFY LCID 2 RB id 2 reconfigured with SN size 5 and RLC AM
-[PDCP] [FRAME 00000][eNB][MOD 00][RNTI 617b][DRB 01] Action MODIFY LCID 3 RB id 1 reconfigured with SN size 1 and RLC AM
-[RRC] [eNB 0] Frame 0 CC 0 : SRB2 is now active
-[RRC] [eNB 0] Frame 0 : Logical Channel UL-DCCH, Received LTE_RRCConnectionReconfigurationComplete from UE rnti 617b, reconfiguring DRB 1/LCID 3
-[RRC] [eNB 0] Frame 0 : Logical Channel UL-DCCH, Received LTE_RRCConnectionReconfigurationComplete, reconfiguring DRB 1/LCID 3
-[MAC] UE 0 RNTI 617b adding LC 3 idx 2 to scheduling control (total 3)
-[MAC] Added physicalConfigDedicated 0x7f98e0004950 for 0.0
-[S1AP] initial_ctxt_resp_p: e_rab ID 5, enb_addr 192.168.61.20, SIZE 4
-[SCTP] Successfully sent 40 bytes on stream 1 for assoc_id 676
-[SCTP] Successfully sent 61 bytes on stream 1 for assoc_id 676
+7320446.555734 [RRC] I [FRAME 00000][eNB][MOD 00][RNTI bd8c] Logical Channel DL-DCCH, Generate UECapabilityEnquiry (bytes 10)
+7320446.555739 [RRC] I sent RRC_DCCH_DATA_REQ to TASK_PDCP_ENB
+7320446.570284 [RRC] I [FRAME 00000][eNB][MOD 00][RNTI bd8c] received ueCapabilityInformation on UL-DCCH 1 from UE
+7320446.570293 [RRC] A got UE capabilities for UE bd8c
+7320446.570346 [RRC] W drx_Configuration parameter is NULL, cannot configure local UE parameters or CDRX is deactivated
+7320446.570370 [RRC] I [eNB 0] frame 0: requesting A2, A3, A4, and A5 event reporting
+7320446.570435 [RRC] I RRCConnectionReconfiguration Encoded 1146 bits (144 bytes)
+7320446.570440 [RRC] I [eNB 0] Frame 0, Logical Channel DL-DCCH, Generate LTE_RRCConnectionReconfiguration (bytes 144, UE id bd8c)
+7320446.570445 [RRC] I sent RRC_DCCH_DATA_REQ to TASK_PDCP_ENB
+7320446.570446 [SCTP] I Successfully sent 46 bytes on stream 1 for assoc_id 4120
+7320446.570449 [PDCP] I [FRAME 00000][eNB][MOD 00][RNTI bd8c][SRB 02] Action ADD LCID 2 (SRB id 2) configured with SN size 5 bits and RLC AM
+7320446.570455 [PDCP] I [FRAME 00000][eNB][MOD 00][RNTI bd8c][DRB 01] Action ADD LCID 3 (DRB id 1) configured with SN size 12 bits and RLC AM
+7320446.583036 [RRC] I [FRAME 00000][eNB][MOD 00][RNTI bd8c] UE State = RRC_RECONFIGURED (default DRB, xid 0)
+7320446.583056 [PDCP] I [FRAME 00000][eNB][MOD 00][RNTI bd8c][SRB 02] Action MODIFY LCID 2 RB id 2 reconfigured with SN size 5 and RLC AM
+7320446.583060 [PDCP] I [FRAME 00000][eNB][MOD 00][RNTI bd8c][DRB 01] Action MODIFY LCID 3 RB id 1 reconfigured with SN size 1 and RLC AM
+7320446.583065 [RRC] I [eNB 0] Frame 0 CC 0 : SRB2 is now active
+7320446.583067 [RRC] I [eNB 0] Frame 0 : Logical Channel UL-DCCH, Received LTE_RRCConnectionReconfigurationComplete from UE rnti bd8c, reconfiguring DRB 1/LCID 3
+7320446.583070 [RRC] I [eNB 0] Frame 0 : Logical Channel UL-DCCH, Received LTE_RRCConnectionReconfigurationComplete, reconfiguring DRB 1/LCID 3
+7320446.583074 [MAC] I UE 0 RNTI bd8c adding LC 3 idx 2 to scheduling control (total 3)
+7320446.583077 [MAC] I Added physicalConfigDedicated 0x7fd18c46be50 for 0.0
+7320446.583095 [S1AP] I initial_ctxt_resp_p: e_rab ID 5, enb_addr 192.168.61.20, SIZE 4
+7320446.583150 [SCTP] I Successfully sent 40 bytes on stream 1 for assoc_id 4120
+7320446.595495 [SCTP] I Successfully sent 61 bytes on stream 1 for assoc_id 4120
+7320446.774197 [SCTP] I Found data for descriptor 103
+7320446.774227 [SCTP] I [4120][103] Msg of length 53 received, on stream 1, PPID 18
+7320446.774295 [RRC] I [eNB 0] Received S1AP_DOWNLINK_NAS: ue_initial_id 0, eNB_ue_s1ap_id 4527568
+7320446.774316 [RRC] I sent RRC_DCCH_DATA_REQ to TASK_PDCP_ENB
...
```
-On the MME:
+On the MME: be patient, the statistics display update is slow!
```bash
-$ docker logs rfsim4g-oai-mme
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0039 ======================================= STATISTICS ============================================
-
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0042 | Current Status| Added since last display| Removed since last display |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0048 Connected eNBs | 1 | 0 | 0 |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0054 Attached UEs | 1 | 0 | 0 |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0060 Connected UEs | 1 | 0 | 0 |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0066 Default Bearers| 0 | 0 | 0 |
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0072 S1-U Bearers | 0 | 0 | 0 |
-
-DEBUG MME-AP src/mme_app/mme_app_statistics.c:0075 ======================================= STATISTICS ============================================
+$ docker exec rfsim4g-magma-mme /bin/bash -c "cat /var/log/mme.log"
+000413 Fri Feb 11 09:52:52 2022 7EFFE8BE6700 INFO GTPv2- lib/gtpv2-c/nwgtpv2c-0.11/src/Nw:2376 Stopped active timer 0x2 for info 0x0x60700001a9b0!
+000414 Fri Feb 11 09:52:52 2022 7EFFEA3E9700 DEBUG MME-AP tasks/mme_app/mme_app_state_mana:0097 Inside get_state with read_from_db 0
+000415 Fri Feb 11 09:52:52 2022 7EFFEA3E9700 DEBUG MME-AP tasks/mme_app/mme_app_main.c :0083 MME APP ZMQ latency: 172.
+000416 Fri Feb 11 09:52:52 2022 7EFFEA3E9700 INFO MME-AP tasks/mme_app/mme_app_main.c :0137 Received S11 MODIFY BEARER RESPONSE from SPGW
+000417 Fri Feb 11 09:52:52 2022 7EFFEA3E9700 DEBUG MME-AP tasks/mme_app/mme_app_main.c :0150 S11 MODIFY BEARER RESPONSE local S11 teid = 1
+000418 Fri Feb 11 09:52:52 2022 7EFFEA3E9700 DEBUG MME-AP tasks/mme_app/mme_app_state_mana:0097 Inside get_state with read_from_db 0
+000419 Fri Feb 11 09:53:28 2022 7EFFEA3E9700 DEBUG MME-AP tasks/mme_app/mme_app_state_mana:0097 Inside get_state with read_from_db 0
+000420 Fri Feb 11 09:53:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0049 ======================================= STATISTICS ============================================
+
+000421 Fri Feb 11 09:53:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0050 | Current Status|
+000422 Fri Feb 11 09:53:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0053 Attached UEs | 0 |
+000423 Fri Feb 11 09:53:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0056 Connected UEs | 0 |
+000424 Fri Feb 11 09:53:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0059 Connected eNBs | 1 |
+000425 Fri Feb 11 09:53:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0062 Default Bearers| 0 |
+000426 Fri Feb 11 09:53:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0065 S1-U Bearers | 0 |
+
+000427 Fri Feb 11 09:53:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0070 ======================================= STATISTICS ============================================
+
+000428 Fri Feb 11 09:54:28 2022 7EFFEA3E9700 DEBUG MME-AP tasks/mme_app/mme_app_state_mana:0097 Inside get_state with read_from_db 0
+000429 Fri Feb 11 09:54:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0049 ======================================= STATISTICS ============================================
+
+000430 Fri Feb 11 09:54:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0050 | Current Status|
+000431 Fri Feb 11 09:54:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0053 Attached UEs | 1 |
+000432 Fri Feb 11 09:54:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0056 Connected UEs | 1 |
+000433 Fri Feb 11 09:54:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0059 Connected eNBs | 1 |
+000434 Fri Feb 11 09:54:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0062 Default Bearers| 1 |
+000435 Fri Feb 11 09:54:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0065 S1-U Bearers | 1 |
+
+000436 Fri Feb 11 09:54:28 2022 7EFFEC3ED700 DEBUG SERVIC tasks/service303/service303_mme_:0070 ======================================= STATISTICS ============================================
```
On the LTE UE:
@@ -377,16 +389,18 @@ Stopping rfsim4g-oai-lte-ue0 ... done
Stopping rfsim4g-oai-enb ... done
Stopping rfsim4g-oai-spgwu-tiny ... done
Stopping rfsim4g-oai-spgwc ... done
-Stopping rfsim4g-oai-mme ... done
+Stopping rfsim4g-magma-mme ... done
Stopping rfsim4g-oai-hss ... done
+Stopping rfsim4g-redis ... done
Stopping rfsim4g-trf-gen ... done
Stopping rfsim4g-cassandra ... done
Removing rfsim4g-oai-lte-ue0 ... done
Removing rfsim4g-oai-enb ... done
Removing rfsim4g-oai-spgwu-tiny ... done
Removing rfsim4g-oai-spgwc ... done
-Removing rfsim4g-oai-mme ... done
+Removing rfsim4g-magma-mme ... done
Removing rfsim4g-oai-hss ... done
+Removing rfsim4g-redis ... done
Removing rfsim4g-trf-gen ... done
Removing rfsim4g-cassandra ... done
Removing network rfsim4g-oai-private-net
@@ -443,19 +457,23 @@ My 1st UE IMSI is an aggregation of `MCC`, `MNC`, `SHORT_IMSI`.
## 5.2. PLMN and TAI ##
-in MME config:
+in MME config, in the docker-compose there is not much besides REALM fields:
```yaml
+ TZ: Europe/Paris
REALM: openairinterface.org
-..
- MCC: '208'
- MNC: '96'
- MME_GID: 32768
- MME_CODE: 3
- TAC_0: 1
- TAC_1: 2
- TAC_2: 3
+ PREFIX: /openair-mme/etc
+ HSS_HOSTNAME: hss
+ HSS_FQDN: hss.openairinterface.org
+ HSS_REALM: openairinterface.org
MME_FQDN: mme.openairinterface.org
+ FEATURES: mme_oai
+```
+
+Everything is hard-coded in the `mme.conf` that is mounted as a volume: look for instances of
+
+```
+MCC="208" ; MNC="96"; TAC = "1";
```
in SPGW-C/-U configs:
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
index e852643ab9227564e8cbc2c3dca1721a473c8e23..b15e794c1026a11657e4c1deaa9ef2b75aace8c6 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
@@ -58,57 +58,45 @@ services:
timeout: 5s
retries: 5
- oai_mme:
- image: oai-mme:latest
- container_name: rfsim4g-oai-mme
+ redis:
+ image: redis:6.0.5
+ container_name: rfsim4g-redis
privileged: true
- depends_on: [oai_hss]
+ networks:
+ public_net:
+ ipv4_address: 192.168.61.6
+ volumes:
+ - ./redis_extern.conf:/usr/local/etc/redis/redis.conf
+ entrypoint: /bin/bash -c "redis-server /usr/local/etc/redis/redis.conf"
+ healthcheck:
+ test: /bin/bash -c "redis-cli -h 192.168.61.6 -p 6380 ping"
+ interval: 10s
+ timeout: 5s
+ retries: 5
+
+ magma_mme:
+ image: magma-mme:latest
+ container_name: rfsim4g-magma-mme
+ hostname: mme
+ privileged: true
+ depends_on: [oai_hss, redis]
networks:
public_net:
ipv4_address: 192.168.61.3
environment:
+ TZ: Europe/Paris
REALM: openairinterface.org
PREFIX: /openair-mme/etc
- INSTANCE: 1
- PID_DIRECTORY: /var/run
- HSS_IP_ADDR: 192.168.61.2
HSS_HOSTNAME: hss
HSS_FQDN: hss.openairinterface.org
HSS_REALM: openairinterface.org
- MCC: '208'
- MNC: '96'
- MME_GID: 32768
- MME_CODE: 3
- TAC_0: 1
- TAC_1: 2
- TAC_2: 3
MME_FQDN: mme.openairinterface.org
- MME_S6A_IP_ADDR: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S1_MME: eth0
- MME_IPV4_ADDRESS_FOR_S1_MME: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S11: eth0
- MME_IPV4_ADDRESS_FOR_S11: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S10: lo
- MME_IPV4_ADDRESS_FOR_S10: 127.0.0.10
- OUTPUT: CONSOLE
- SGW_IPV4_ADDRESS_FOR_S11_0: 192.168.61.4
- PEER_MME_IPV4_ADDRESS_FOR_S10_0: 0.0.0.0
- PEER_MME_IPV4_ADDRESS_FOR_S10_1: 0.0.0.0
- MCC_SGW_0: '208'
- MNC3_SGW_0: '096'
- TAC_LB_SGW_0: '01'
- TAC_HB_SGW_0: '00'
- MCC_MME_0: '208'
- MNC3_MME_0: '096'
- TAC_LB_MME_0: '02'
- TAC_HB_MME_0: '00'
- MCC_MME_1: '208'
- MNC3_MME_1: '096'
- TAC_LB_MME_1: '03'
- TAC_HB_MME_1: '00'
- TAC_LB_SGW_TEST_0: '03'
- TAC_HB_SGW_TEST_0: '00'
- SGW_IPV4_ADDRESS_FOR_S11_TEST_0: 0.0.0.0
+ FEATURES: mme_oai
+ volumes:
+ - ./mme_fd.sprint.conf:/magma-mme/etc/mme_fd.conf.tmplt
+ - ./mme.conf:/magma-mme/etc/mme.conf
+ - ./entrypoint.sh:/magma-mme/bin/entrypoint.sh
+ entrypoint: /bin/bash -c "/magma-mme/bin/entrypoint.sh"
healthcheck:
test: /bin/bash -c "pgrep oai_mme"
interval: 10s
@@ -118,7 +106,7 @@ services:
oai_spgwc:
image: oai-spgwc:latest
privileged: true
- depends_on: [oai_mme]
+ depends_on: [magma_mme]
container_name: rfsim4g-oai-spgwc
networks:
public_net:
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/entrypoint.sh b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/entrypoint.sh
new file mode 100755
index 0000000000000000000000000000000000000000..24960e215d5f56bf5dd78aa67270a490e8745125
--- /dev/null
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/entrypoint.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+INSTANCE=1
+PREFIX='/magma-mme/etc'
+MY_REALM='openairinterface.org'
+
+declare -A MME_CONF
+
+pushd $PREFIX
+MME_CONF[@MME_S6A_IP_ADDR@]="192.168.61.3"
+MME_CONF[@INSTANCE@]=$INSTANCE
+MME_CONF[@PREFIX@]=$PREFIX
+MME_CONF[@REALM@]=$MY_REALM
+MME_CONF[@MME_FQDN@]="mme.${MME_CONF[@REALM@]}"
+MME_CONF[@HSS_HOSTNAME@]='hss'
+MME_CONF[@HSS_FQDN@]="${MME_CONF[@HSS_HOSTNAME@]}.${MME_CONF[@REALM@]}"
+MME_CONF[@HSS_IP_ADDR@]="192.168.61.2"
+
+cp mme_fd.conf.tmplt $PREFIX/mme_fd.conf
+
+for K in "${!MME_CONF[@]}"; do
+ egrep -lRZ "$K" $PREFIX/mme_fd.conf | xargs -0 -l sed -i -e "s|$K|${MME_CONF[$K]}|g"
+ ret=$?;[[ ret -ne 0 ]] && echo "Could not replace $K with ${MME_CONF[$K]}"
+done
+
+sed -i -e "s@etc/freeDiameter@etc@" /magma-mme/etc/mme_fd.conf
+sed -i -e "s@bind: 127.0.0.1@bind: 192.168.61.6@" /etc/magma/redis.yml
+# Generate freeDiameter certificate
+popd
+cd /magma-mme/scripts
+./check_mme_s6a_certificate $PREFIX mme.${MME_CONF[@REALM@]}
+
+cd /magma-mme
+nohup /magma-mme/bin/sctpd > /var/log/sctpd.log 2>&1 &
+sleep 5
+/magma-mme/bin/oai_mme -c /magma-mme/etc/mme.conf
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/mme.conf b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/mme.conf
new file mode 100644
index 0000000000000000000000000000000000000000..4f491cc63db602d521a13dde9d36ab25c5ee91fb
--- /dev/null
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/mme.conf
@@ -0,0 +1,134 @@
+# generated by generate_mme_config_script.py
+MME :
+{
+ REALM = "openairinterface.org"
+ PID_DIRECTORY = "/var/run";
+ MAXENB = 8; # power of 2
+ MAXUE = 16; # power of 2
+ RELATIVE_CAPACITY = 10;
+
+ EMERGENCY_ATTACH_SUPPORTED = "no";
+ UNAUTHENTICATED_IMSI_SUPPORTED = "no";
+
+ # EPS network feature support
+ EPS_NETWORK_FEATURE_SUPPORT_IMS_VOICE_OVER_PS_SESSION_IN_S1 = "no"; # DO NOT CHANGE
+ EPS_NETWORK_FEATURE_SUPPORT_EMERGENCY_BEARER_SERVICES_IN_S1_MODE = "no"; # DO NOT CHANGE
+ EPS_NETWORK_FEATURE_SUPPORT_LOCATION_SERVICES_VIA_EPC = "no"; # DO NOT CHANGE
+ EPS_NETWORK_FEATURE_SUPPORT_EXTENDED_SERVICE_REQUEST = "no"; # DO NOT CHANGE
+
+ # Display statistics about whole system (expressed in seconds)
+ MME_STATISTIC_TIMER = 10;
+ IP_CAPABILITY = "IPV4"; # UE PDN_TYPE
+ USE_STATELESS = "";
+
+ INTERTASK_INTERFACE :
+ {
+ # max queue size per task
+ ITTI_QUEUE_SIZE = 2000000;
+ };
+
+ S6A :
+ {
+ S6A_CONF = "/magma-mme/etc/mme_fd.conf"; # YOUR MME freeDiameter config file path
+ HSS_HOSTNAME = "hss.openairinterface.org";
+ HSS_REALM = "openairinterface.org";
+ };
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 8;
+ SCTP_OUTSTREAMS = 8;
+ };
+
+ # ------- S1AP definitions
+ S1AP :
+ {
+ # outcome drop timer value (seconds)
+ S1AP_OUTCOME_TIMER = 10;
+ };
+
+ # ------- MME served GUMMEIs
+ GUMMEI_LIST = (
+ { MCC="208" ; MNC="96"; MME_GID="32768" ; MME_CODE="3"; }
+ );
+
+ # ------- MME served TAIs
+ TAI_LIST = (
+ {MCC="208" ; MNC="96"; TAC = "1"; }
+ );
+
+ TAC_LIST = (
+ {MCC="208" ; MNC="96"; TAC = "1"; }
+ );
+
+ CSFB :
+ {
+ NON_EPS_SERVICE_CONTROL = "OFF";
+ CSFB_MCC = "208";
+ CSFB_MNC = "96";
+ LAC = "1";
+ };
+ NAS :
+ {
+ ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA2" , "EIA1" , "EIA0" ];
+ ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
+ T3402 = 1 # in minutes (default is 12 minutes)
+ T3412 = 54 # in minutes (default is 54 minutes, network dependent)
+ T3422 = 6 # in seconds (default is 6s)
+ T3450 = 6 # in seconds (default is 6s)
+ T3460 = 6 # in seconds (default is 6s)
+ T3470 = 6 # in seconds (default is 6s)
+ T3485 = 8 # UNUSED in seconds (default is 8s)
+ T3486 = 8 # UNUSED in seconds (default is 8s)
+ T3489 = 4 # UNUSED in seconds (default is 4s)
+ T3495 = 8 # UNUSED in seconds (default is 8s)
+ };
+
+ SGS :
+ {
+ TS6_1 = 10 # in seconds (default is 10s)
+ TS8 = 4 # in seconds (default is 4s)
+ TS9 = 2 # in seconds (default is 4s)
+ TS10 = 4 # in seconds (default is 4s)
+ TS13 = 4 # in seconds (default is 4s)
+ };
+
+ NETWORK_INTERFACES :
+ {
+ MME_INTERFACE_NAME_FOR_S1_MME = "eth0";
+ MME_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.3/24";
+ MME_INTERFACE_NAME_FOR_S11_MME = "eth0";
+ MME_IPV4_ADDRESS_FOR_S11_MME = "192.168.61.3/24";
+ MME_PORT_FOR_S11_MME = 2123;
+ };
+
+ LOGGING :
+ {
+ OUTPUT = "CONSOLE";
+ THREAD_SAFE = "no";
+ COLOR = "no";
+
+ SCTP_LOG_LEVEL = "ERROR";
+ GTPV1U_LOG_LEVEL = "INFO";
+ SPGW_APP_LOG_LEVEL = "INFO";
+ UDP_LOG_LEVEL = "INFO";
+ S1AP_LOG_LEVEL = "DEBUG";
+ NAS_LOG_LEVEL = "INFO";
+ MME_APP_LOG_LEVEL = "DEBUG";
+ GTPV2C_LOG_LEVEL = "INFO";
+ S11_LOG_LEVEL = "DEBUG";
+ S6A_LOG_LEVEL = "DEBUG";
+ UTIL_LOG_LEVEL = "INFO";
+ MSC_LOG_LEVEL = "ERROR";
+ ITTI_LOG_LEVEL = "ERROR";
+ MME_SCENARIO_PLAYER_LOG_LEVEL = "ERROR";
+ ASN1_VERBOSITY = "INFO";
+ };
+
+ S-GW :
+ {
+ SGW_IPV4_ADDRESS_FOR_S11 = "192.168.61.4";
+ };
+};
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/mme_fd.sprint.conf b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/mme_fd.sprint.conf
new file mode 100644
index 0000000000000000000000000000000000000000..6f87ed8c2b29db3008ca415b263e911dc3383e4e
--- /dev/null
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/mme_fd.sprint.conf
@@ -0,0 +1,169 @@
+# -------- Local ---------
+
+# Uncomment if the framework cannot resolv it.
+Identity = "@MME_FQDN@";
+Realm = "@REALM@";
+
+# TLS configuration (see previous section)
+TLS_Cred = "@PREFIX@/freeDiameter/mme.cert.pem",
+ "@PREFIX@/freeDiameter/mme.key.pem";
+TLS_CA = "@PREFIX@/freeDiameter/mme.cacert.pem";
+
+# Disable use of TCP protocol (only listen and connect in SCTP)
+# Default : TCP enabled
+No_SCTP;
+
+# This option is ignored if freeDiameter is compiled with DISABLE_SCTP option.
+# Prefer TCP instead of SCTP for establishing new connections.
+# This setting may be overwritten per peer in peer configuration blocs.
+# Default : SCTP is attempted first.
+Prefer_TCP;
+
+
+No_IPv6;
+
+# Overwrite the number of SCTP streams. This value should be kept low,
+# especially if you are using TLS over SCTP, because it consumes a lot of
+# resources in that case. See tickets 19 and 27 for some additional details on
+# this.
+# Limit the number of SCTP streams
+SCTP_streams = 3;
+
+
+# By default, freeDiameter acts as a Diameter Relay Agent by forwarding all
+# messages it cannot handle locally. This parameter disables this behavior.
+NoRelay;
+
+# Use RFC3588 method for TLS protection, where TLS is negociated after CER/CEA exchange is completed
+# on the unsecure connection. The alternative is RFC6733 mechanism, where TLS protects also the
+# CER/CEA exchange on a dedicated secure port.
+# This parameter only affects outgoing connections.
+# The setting can be also defined per-peer (see Peers configuration section).
+# Default: use RFC6733 method with separate port for TLS.
+
+#TLS_old_method;
+
+AppServThreads = 4;
+
+# Specify the addresses on which to bind the listening server. This must be
+# specified if the framework is unable to auto-detect these addresses, or if the
+# auto-detected values are incorrect. Note that the list of addresses is sent
+# in CER or CEA message, so one should pay attention to this parameter if some
+# adresses should be kept hidden.
+ListenOn = "@MME_S6A_IP_ADDR@";
+
+Port = 3870;
+SecPort = 5870;
+
+# -------- Extensions ---------
+
+# Uncomment (and create rtd.conf) to specify routing table for this peer.
+#LoadExtension = "/usr/local/lib/freeDiameter/rt_default.fdx" : "rtd.conf";
+
+#LoadExtension = "/usr/local/lib/freeDiameter/_sample.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/app_acct.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/app_diameap.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/app_radgw.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/app_redirect.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/app_sip.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dbg_interactive.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dbg_monitor.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dbg_msg_dumps.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dbg_msg_timings.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dbg_rt.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_3gpp2_avps.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_CreditControl.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_CxDx.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_Gx.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_NAS.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_Ro.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_Rx.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_S6mS6n.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_SGd.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_SLh.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_Sd.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_Sh.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_T4.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_T6aT6bT7.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_Tsp.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_dcca.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_dcca_3gpp.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_dcca_starent.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_draftload_avps.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_eap.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_etsi283034_avps.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_legacy_xml.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_mip6a.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_mip6i.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_nas_mipv6.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_nasreq.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc4004_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc4006bis_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc4072_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc4590_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc5447_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc5580_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc5777_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc5778_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc6734_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc6942_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc7155_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc7683_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc7944_avps.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_sip.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29061_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29128_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29154_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29173_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29212_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29214_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29215_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29217_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29229_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29272_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29273_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29329_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29336_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29337_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29338_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29343_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29344_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29345_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29368_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29468_avps.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_ts32299_avps.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/rt_busypeers.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/rt_default.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/rt_ereg.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/rt_ignore_dh.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/rt_load_balance.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/rt_randomize.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/rt_redirect.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/test_acct.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/test_app.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/test_hss.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/test_netemul.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/test_rt_any.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/test_sip.fdx";
+#LoadExtension = "/usr/local/lib/freeDiameter/dict_Rf.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_S6as6d.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_S6t.fdx";
+LoadExtension = "/usr/local/lib/freeDiameter/dict_S6c.fdx";
+
+
+# -------- Peers ---------
+
+# The framework will actively attempt to establish and maintain a connection
+# with the peers listed here.
+# For only accepting incoming connections, see the acl_wl.fx extension.
+
+# ConnectPeer
+# Declare a remote peer to which this peer must maintain a connection.
+# In addition, this allows specifying non-default parameters for this peer only
+# (for example disable SCTP with this peer, or use RFC3588-flavour TLS).
+# Note that by default, if a peer is not listed as a ConnectPeer entry, an
+# incoming connection from this peer will be rejected. If you want to accept
+# incoming connections from other peers, see the acl_wl.fdx? extension which
+# allows exactly this.
+
+ConnectPeer= "@HSS_FQDN@" { ConnectTo = "@HSS_IP_ADDR@"; No_SCTP ; No_IPv6; Prefer_TCP; No_TLS; port = 3868;};
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/redis_extern.conf b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/redis_extern.conf
new file mode 100644
index 0000000000000000000000000000000000000000..1ee9dd9a788f71657c0cff646fe7118cdbfda0bb
--- /dev/null
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/redis_extern.conf
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2016-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+# Jinja template for Redis configuration
+# See the default config file for options and explanations:
+# https://github.com/antirez/redis/blob/unstable/redis.conf
+
+# TODO: make sensible, production-aware config decisions
+
+bind 192.168.61.6
+port 6380
+
+daemonize no
+loglevel notice
+
+timeout 0
+databases 1
+
+dbfilename redis_dump.rdb
+dir /data
+
+# Save the DB on disk
+
+save 900 1
+
+save 300 10
+
+save 60 1000
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
index 4c1ceb424a09e08d3d5d5a316500fb7efda90f9e..e1e992c94c2a668cdd4f9fd2ab0c1449f25d753f 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
@@ -58,57 +58,45 @@ services:
timeout: 5s
retries: 5
- oai_mme:
- image: oai-mme:latest
- container_name: rfsim4g-oai-mme
+ redis:
+ image: redis:6.0.5
+ container_name: rfsim4g-redis
privileged: true
- depends_on: [oai_hss]
+ networks:
+ public_net:
+ ipv4_address: 192.168.61.6
+ volumes:
+ - ../4g_rfsimulator_fdd_05MHz/redis_extern.conf:/usr/local/etc/redis/redis.conf
+ entrypoint: /bin/bash -c "redis-server /usr/local/etc/redis/redis.conf"
+ healthcheck:
+ test: /bin/bash -c "redis-cli -h 192.168.61.6 -p 6380 ping"
+ interval: 10s
+ timeout: 5s
+ retries: 5
+
+ magma_mme:
+ image: magma-mme:latest
+ container_name: rfsim4g-magma-mme
+ hostname: mme
+ privileged: true
+ depends_on: [oai_hss, redis]
networks:
public_net:
ipv4_address: 192.168.61.3
environment:
+ TZ: Europe/Paris
REALM: openairinterface.org
PREFIX: /openair-mme/etc
- INSTANCE: 1
- PID_DIRECTORY: /var/run
- HSS_IP_ADDR: 192.168.61.2
HSS_HOSTNAME: hss
HSS_FQDN: hss.openairinterface.org
HSS_REALM: openairinterface.org
- MCC: '208'
- MNC: '96'
- MME_GID: 32768
- MME_CODE: 3
- TAC_0: 1
- TAC_1: 2
- TAC_2: 3
MME_FQDN: mme.openairinterface.org
- MME_S6A_IP_ADDR: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S1_MME: eth0
- MME_IPV4_ADDRESS_FOR_S1_MME: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S11: eth0
- MME_IPV4_ADDRESS_FOR_S11: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S10: lo
- MME_IPV4_ADDRESS_FOR_S10: 127.0.0.10
- OUTPUT: CONSOLE
- SGW_IPV4_ADDRESS_FOR_S11_0: 192.168.61.4
- PEER_MME_IPV4_ADDRESS_FOR_S10_0: 0.0.0.0
- PEER_MME_IPV4_ADDRESS_FOR_S10_1: 0.0.0.0
- MCC_SGW_0: '208'
- MNC3_SGW_0: '096'
- TAC_LB_SGW_0: '01'
- TAC_HB_SGW_0: '00'
- MCC_MME_0: '208'
- MNC3_MME_0: '096'
- TAC_LB_MME_0: '02'
- TAC_HB_MME_0: '00'
- MCC_MME_1: '208'
- MNC3_MME_1: '096'
- TAC_LB_MME_1: '03'
- TAC_HB_MME_1: '00'
- TAC_LB_SGW_TEST_0: '03'
- TAC_HB_SGW_TEST_0: '00'
- SGW_IPV4_ADDRESS_FOR_S11_TEST_0: 0.0.0.0
+ FEATURES: mme_oai
+ volumes:
+ - ../4g_rfsimulator_fdd_05MHz/mme_fd.sprint.conf:/magma-mme/etc/mme_fd.conf.tmplt
+ - ../4g_rfsimulator_fdd_05MHz/mme.conf:/magma-mme/etc/mme.conf
+ - ../4g_rfsimulator_fdd_05MHz/entrypoint.sh:/magma-mme/bin/entrypoint.sh
+ entrypoint: /bin/bash -c "/magma-mme/bin/entrypoint.sh"
healthcheck:
test: /bin/bash -c "pgrep oai_mme"
interval: 10s
@@ -118,7 +106,7 @@ services:
oai_spgwc:
image: oai-spgwc:latest
privileged: true
- depends_on: [oai_mme]
+ depends_on: [magma_mme]
container_name: rfsim4g-oai-spgwc
networks:
public_net:
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
index 4a61181afbb620fa64d839e3b82fac5291eddfc5..ad665813f2a5bb1a956e7f7056dadf63bc7c4d5b 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
@@ -58,57 +58,45 @@ services:
timeout: 5s
retries: 5
- oai_mme:
- image: oai-mme:latest
- container_name: rfsim4g-oai-mme
+ redis:
+ image: redis:6.0.5
+ container_name: rfsim4g-redis
privileged: true
- depends_on: [oai_hss]
+ networks:
+ public_net:
+ ipv4_address: 192.168.61.6
+ volumes:
+ - ../4g_rfsimulator_fdd_05MHz/redis_extern.conf:/usr/local/etc/redis/redis.conf
+ entrypoint: /bin/bash -c "redis-server /usr/local/etc/redis/redis.conf"
+ healthcheck:
+ test: /bin/bash -c "redis-cli -h 192.168.61.6 -p 6380 ping"
+ interval: 10s
+ timeout: 5s
+ retries: 5
+
+ magma_mme:
+ image: magma-mme:latest
+ container_name: rfsim4g-magma-mme
+ hostname: mme
+ privileged: true
+ depends_on: [oai_hss, redis]
networks:
public_net:
ipv4_address: 192.168.61.3
environment:
+ TZ: Europe/Paris
REALM: openairinterface.org
PREFIX: /openair-mme/etc
- INSTANCE: 1
- PID_DIRECTORY: /var/run
- HSS_IP_ADDR: 192.168.61.2
HSS_HOSTNAME: hss
HSS_FQDN: hss.openairinterface.org
HSS_REALM: openairinterface.org
- MCC: '208'
- MNC: '96'
- MME_GID: 32768
- MME_CODE: 3
- TAC_0: 1
- TAC_1: 2
- TAC_2: 3
MME_FQDN: mme.openairinterface.org
- MME_S6A_IP_ADDR: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S1_MME: eth0
- MME_IPV4_ADDRESS_FOR_S1_MME: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S11: eth0
- MME_IPV4_ADDRESS_FOR_S11: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S10: lo
- MME_IPV4_ADDRESS_FOR_S10: 127.0.0.10
- OUTPUT: CONSOLE
- SGW_IPV4_ADDRESS_FOR_S11_0: 192.168.61.4
- PEER_MME_IPV4_ADDRESS_FOR_S10_0: 0.0.0.0
- PEER_MME_IPV4_ADDRESS_FOR_S10_1: 0.0.0.0
- MCC_SGW_0: '208'
- MNC3_SGW_0: '096'
- TAC_LB_SGW_0: '01'
- TAC_HB_SGW_0: '00'
- MCC_MME_0: '208'
- MNC3_MME_0: '096'
- TAC_LB_MME_0: '02'
- TAC_HB_MME_0: '00'
- MCC_MME_1: '208'
- MNC3_MME_1: '096'
- TAC_LB_MME_1: '03'
- TAC_HB_MME_1: '00'
- TAC_LB_SGW_TEST_0: '03'
- TAC_HB_SGW_TEST_0: '00'
- SGW_IPV4_ADDRESS_FOR_S11_TEST_0: 0.0.0.0
+ FEATURES: mme_oai
+ volumes:
+ - ../4g_rfsimulator_fdd_05MHz/mme_fd.sprint.conf:/magma-mme/etc/mme_fd.conf.tmplt
+ - ../4g_rfsimulator_fdd_05MHz/mme.conf:/magma-mme/etc/mme.conf
+ - ../4g_rfsimulator_fdd_05MHz/entrypoint.sh:/magma-mme/bin/entrypoint.sh
+ entrypoint: /bin/bash -c "/magma-mme/bin/entrypoint.sh"
healthcheck:
test: /bin/bash -c "pgrep oai_mme"
interval: 10s
@@ -118,7 +106,7 @@ services:
oai_spgwc:
image: oai-spgwc:latest
privileged: true
- depends_on: [oai_mme]
+ depends_on: [magma_mme]
container_name: rfsim4g-oai-spgwc
networks:
public_net:
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
index 3424780791e5b1efaf468781bb99b698fade02e0..ffa92bac4907046960d4f7a4bcaa4af6b488dafe 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
@@ -58,57 +58,45 @@ services:
timeout: 5s
retries: 5
- oai_mme:
- image: oai-mme:latest
- container_name: rfsim4g-oai-mme
+ redis:
+ image: redis:6.0.5
+ container_name: rfsim4g-redis
privileged: true
- depends_on: [oai_hss]
+ networks:
+ public_net:
+ ipv4_address: 192.168.61.6
+ volumes:
+ - ../4g_rfsimulator_fdd_05MHz/redis_extern.conf:/usr/local/etc/redis/redis.conf
+ entrypoint: /bin/bash -c "redis-server /usr/local/etc/redis/redis.conf"
+ healthcheck:
+ test: /bin/bash -c "redis-cli -h 192.168.61.6 -p 6380 ping"
+ interval: 10s
+ timeout: 5s
+ retries: 5
+
+ magma_mme:
+ image: magma-mme:latest
+ container_name: rfsim4g-magma-mme
+ hostname: mme
+ privileged: true
+ depends_on: [oai_hss, redis]
networks:
public_net:
ipv4_address: 192.168.61.3
environment:
+ TZ: Europe/Paris
REALM: openairinterface.org
PREFIX: /openair-mme/etc
- INSTANCE: 1
- PID_DIRECTORY: /var/run
- HSS_IP_ADDR: 192.168.61.2
HSS_HOSTNAME: hss
HSS_FQDN: hss.openairinterface.org
HSS_REALM: openairinterface.org
- MCC: '208'
- MNC: '96'
- MME_GID: 32768
- MME_CODE: 3
- TAC_0: 1
- TAC_1: 2
- TAC_2: 3
MME_FQDN: mme.openairinterface.org
- MME_S6A_IP_ADDR: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S1_MME: eth0
- MME_IPV4_ADDRESS_FOR_S1_MME: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S11: eth0
- MME_IPV4_ADDRESS_FOR_S11: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S10: lo
- MME_IPV4_ADDRESS_FOR_S10: 127.0.0.10
- OUTPUT: CONSOLE
- SGW_IPV4_ADDRESS_FOR_S11_0: 192.168.61.4
- PEER_MME_IPV4_ADDRESS_FOR_S10_0: 0.0.0.0
- PEER_MME_IPV4_ADDRESS_FOR_S10_1: 0.0.0.0
- MCC_SGW_0: '208'
- MNC3_SGW_0: '096'
- TAC_LB_SGW_0: '01'
- TAC_HB_SGW_0: '00'
- MCC_MME_0: '208'
- MNC3_MME_0: '096'
- TAC_LB_MME_0: '02'
- TAC_HB_MME_0: '00'
- MCC_MME_1: '208'
- MNC3_MME_1: '096'
- TAC_LB_MME_1: '03'
- TAC_HB_MME_1: '00'
- TAC_LB_SGW_TEST_0: '03'
- TAC_HB_SGW_TEST_0: '00'
- SGW_IPV4_ADDRESS_FOR_S11_TEST_0: 0.0.0.0
+ FEATURES: mme_oai
+ volumes:
+ - ../4g_rfsimulator_fdd_05MHz/mme_fd.sprint.conf:/magma-mme/etc/mme_fd.conf.tmplt
+ - ../4g_rfsimulator_fdd_05MHz/mme.conf:/magma-mme/etc/mme.conf
+ - ../4g_rfsimulator_fdd_05MHz/entrypoint.sh:/magma-mme/bin/entrypoint.sh
+ entrypoint: /bin/bash -c "/magma-mme/bin/entrypoint.sh"
healthcheck:
test: /bin/bash -c "pgrep oai_mme"
interval: 10s
@@ -118,7 +106,7 @@ services:
oai_spgwc:
image: oai-spgwc:latest
privileged: true
- depends_on: [oai_mme]
+ depends_on: [magma_mme]
container_name: rfsim4g-oai-spgwc
networks:
public_net:
diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
index 6a39f2147ea7719ba7337db9b0ffc6713240f0d8..74a23905f0abc4e5258e3837d88c1ae410696732 100644
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
@@ -241,12 +241,12 @@ services:
NSSAI_SD1: 112233
AMF_IP_ADDRESS: 192.168.71.132
GNB_NGA_IF_NAME: eth0
- GNB_NGA_IP_ADDRESS: 192.168.71.136
+ GNB_NGA_IP_ADDRESS: 192.168.71.140
GNB_NGU_IF_NAME: eth0
- GNB_NGU_IP_ADDRESS: 192.168.71.136
+ GNB_NGU_IP_ADDRESS: 192.168.71.140
F1_IF_NAME: eth0
- F1_CU_IP_ADDRESS: 192.168.71.136
- F1_DU_IP_ADDRESS: 192.168.71.138
+ F1_CU_IP_ADDRESS: 192.168.71.140
+ F1_DU_IP_ADDRESS: 192.168.71.142
F1_CU_D_PORT: 2153
F1_DU_D_PORT: 2153
USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
@@ -254,7 +254,7 @@ services:
- oai-ext-dn
networks:
public_net:
- ipv4_address: 192.168.71.136
+ ipv4_address: 192.168.71.140
healthcheck:
test: /bin/bash -c "pgrep nr-softmodem"
interval: 10s
@@ -277,12 +277,12 @@ services:
NSSAI_SD1: 112233
AMF_IP_ADDRESS: 192.168.71.132
GNB_NGA_IF_NAME: eth0
- GNB_NGA_IP_ADDRESS: 192.168.71.138
+ GNB_NGA_IP_ADDRESS: 192.168.71.142
GNB_NGU_IF_NAME: eth0
- GNB_NGU_IP_ADDRESS: 192.168.71.138
+ GNB_NGU_IP_ADDRESS: 192.168.71.142
F1_IF_NAME: eth0
- F1_CU_IP_ADDRESS: 192.168.71.136
- F1_DU_IP_ADDRESS: 192.168.71.138
+ F1_CU_IP_ADDRESS: 192.168.71.140
+ F1_DU_IP_ADDRESS: 192.168.71.142
F1_CU_D_PORT: 2153
F1_DU_D_PORT: 2153
USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
@@ -290,7 +290,7 @@ services:
- oai-cu
networks:
public_net:
- ipv4_address: 192.168.71.138
+ ipv4_address: 192.168.71.142
healthcheck:
test: /bin/bash -c "pgrep nr-softmodem"
interval: 10s
@@ -301,7 +301,7 @@ services:
privileged: true
container_name: rfsim5g-oai-nr-ue
environment:
- RFSIMULATOR: 192.168.71.138
+ RFSIMULATOR: 192.168.71.142
FULL_IMSI: '208990100001100'
FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
OPC: 'C42449363BBAD02B66D16BC975D77CC1'
@@ -313,7 +313,7 @@ services:
- oai-du
networks:
public_net:
- ipv4_address: 192.168.71.137
+ ipv4_address: 192.168.71.150
healthcheck:
test: /bin/bash -c "pgrep nr-uesoftmodem"
interval: 10s
diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/amf-healthcheck.sh b/ci-scripts/yaml_files/5g_fdd_rfsimulator/amf-healthcheck.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8bfdee2aac6150b50240f7af4fa15a5eb105e9bc
--- /dev/null
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/amf-healthcheck.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+AMF_PORT_FOR_NGAP=38412
+AMF_PORT_FOR_N11_HTTP=80
+AMF_IP_NGAP_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_NGAP | grep inet | awk {'print $2'})
+AMF_IP_N11_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_N11 | grep inet | awk {'print $2'})
+N2_PORT_STATUS=$(netstat -Snpl | grep -o "$AMF_IP_NGAP_INTERFACE:$AMF_PORT_FOR_NGAP")
+N11_PORT_STATUS=$(netstat -tnpl | grep -o "$AMF_IP_N11_INTERFACE:$AMF_PORT_FOR_N11_HTTP")
+#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
+NB_UNREPLACED_AT=`cat /openair-amf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+
+if [ $NB_UNREPLACED_AT -ne 0 ]; then
+ STATUS=1
+ echo "Healthcheck error: configuration file is not configured properly"
+fi
+
+if [[ -z $N2_PORT_STATUS ]]; then
+ STATUS=1
+ echo "Healthcheck error: N2 SCTP port $AMF_PORT_FOR_NGAP is not listening"
+fi
+
+if [[ -z $N11_PORT_STATUS ]]; then
+ STATUS=1
+ echo "Healthcheck error: N11/SBI TCP/HTTP port $AMF_PORT_FOR_N11_HTTP is not listening"
+fi
+
+#host="${MYSQL_SERVER}"
+#user="${MYSQL_USER:-root}"
+#export MYSQL_PWD="${MYSQL_PASS}"
+
+#args=(
+# -h"$host"
+# -u"$user"
+# --silent
+#)
+
+#if ! command -v mysql &> /dev/null; then
+# echo "Installing mysql command"
+# apt update
+# apt-get -y install mysql-client
+#else
+# if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
+# database_check=$(mysql -h$host -u$user -D oai_db --silent -e "SELECT * FROM users;")
+# if [[ -z $database_check ]]; then
+# echo "Healthcheck error: oai_db not populated"
+# STATUS=1
+# fi
+# STATUS=0
+# else
+# echo "Healthcheck error: Mysql port inactive"
+# STATUS=1
+# fi
+#fi
+
+exit $STATUS
diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3e46adb9e7eac397a66fc33fe194bddd7ebe2608
--- /dev/null
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
@@ -0,0 +1,298 @@
+version: '3.8'
+services:
+ oai-nrf:
+ container_name: "rfsim5g-oai-nrf"
+ image: oai-nrf:latest
+ environment:
+ - NRF_INTERFACE_NAME_FOR_SBI=eth0
+ - NRF_INTERFACE_PORT_FOR_SBI=80
+ - NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090
+ - NRF_API_VERSION=v1
+ - INSTANCE=0
+ - PID_DIRECTORY=/var/run
+ networks:
+ public_net:
+ ipv4_address: 192.168.71.130
+ volumes:
+ - ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
+ healthcheck:
+ test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh"
+ interval: 10s
+ timeout: 5s
+ retries: 5
+ mysql:
+ container_name: "rfsim5g-mysql"
+ image: mysql:5.7
+ volumes:
+ - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
+ - ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+ environment:
+ - TZ=Europe/Paris
+ - MYSQL_DATABASE=oai_db
+ - MYSQL_USER=test
+ - MYSQL_PASSWORD=test
+ - MYSQL_ROOT_PASSWORD=linux
+ healthcheck:
+ test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
+ interval: 10s
+ timeout: 5s
+ retries: 5
+ networks:
+ public_net:
+ ipv4_address: 192.168.71.131
+ oai-amf:
+ container_name: "rfsim5g-oai-amf"
+ image: oai-amf:latest
+ environment:
+ - TZ=Europe/paris
+ - INSTANCE=0
+ - PID_DIRECTORY=/var/run
+ - MCC=208
+ - MNC=99
+ - REGION_ID=128
+ - AMF_SET_ID=1
+ - SERVED_GUAMI_MCC_0=208
+ - SERVED_GUAMI_MNC_0=99
+ - SERVED_GUAMI_REGION_ID_0=128
+ - SERVED_GUAMI_AMF_SET_ID_0=1
+ - SERVED_GUAMI_MCC_1=460
+ - SERVED_GUAMI_MNC_1=11
+ - SERVED_GUAMI_REGION_ID_1=10
+ - SERVED_GUAMI_AMF_SET_ID_1=1
+ - PLMN_SUPPORT_MCC=208
+ - PLMN_SUPPORT_MNC=99
+ - PLMN_SUPPORT_TAC=0x0001
+ - SST_0=1
+ - SD_0=1
+ - SST_1=1
+ - SD_1=12
+ - AMF_INTERFACE_NAME_FOR_NGAP=eth0
+ - AMF_INTERFACE_NAME_FOR_N11=eth0
+ - SMF_INSTANCE_ID_0=1
+ - SMF_FQDN_0=oai-smf
+ - SMF_IPV4_ADDR_0=0.0.0.0
+ - SMF_HTTP_VERSION_0=v1
+ - SELECTED_0=true
+ - SMF_INSTANCE_ID_1=2
+ - SMF_FQDN_1=oai-smf
+ - SMF_IPV4_ADDR_1=0.0.0.0
+ - SMF_HTTP_VERSION_1=v1
+ - SELECTED_1=false
+ - MYSQL_SERVER=192.168.71.131
+ - MYSQL_USER=root
+ - MYSQL_PASS=linux
+ - MYSQL_DB=oai_db
+ - OPERATOR_KEY=c42449363bbad02b66d16bc975d77cc1
+ - NRF_IPV4_ADDRESS=192.168.71.130
+ - NRF_PORT=80
+ - NF_REGISTRATION=yes
+ - SMF_SELECTION=yes
+ - USE_FQDN_DNS=yes
+ - NRF_API_VERSION=v1
+ - NRF_FQDN=oai-nrf
+ - EXTERNAL_AUSF=no
+ - AUSF_IPV4_ADDRESS=0.0.0.0
+ - AUSF_PORT=80
+ - AUSF_API_VERSION=v1
+ - AUSF_FQDN=localhost
+ depends_on:
+ - oai-nrf
+ - mysql
+ volumes:
+ - ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh
+ healthcheck:
+ test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh"
+ interval: 10s
+ timeout: 15s
+ retries: 5
+ networks:
+ public_net:
+ ipv4_address: 192.168.71.132
+ oai-smf:
+ container_name: "rfsim5g-oai-smf"
+ image: oai-smf:latest
+ environment:
+ - TZ=Europe/Paris
+ - INSTANCE=0
+ - PID_DIRECTORY=/var/run
+ - SMF_INTERFACE_NAME_FOR_N4=eth0
+ - SMF_INTERFACE_NAME_FOR_SBI=eth0
+ - SMF_INTERFACE_PORT_FOR_SBI=80
+ - SMF_INTERFACE_HTTP2_PORT_FOR_SBI=9090
+ - SMF_API_VERSION=v1
+ - DEFAULT_DNS_IPV4_ADDRESS=192.168.18.129
+ - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
+ - AMF_IPV4_ADDRESS=0.0.0.0
+ - AMF_PORT=80
+ - AMF_API_VERSION=v1
+ - AMF_FQDN=oai-amf
+ - UDM_IPV4_ADDRESS=127.0.0.1
+ - UDM_PORT=80
+ - UDM_API_VERSION=v1
+ - UDM_FQDN=localhost
+ - UPF_IPV4_ADDRESS=192.168.71.134
+ - UPF_FQDN_0=oai-spgwu
+ - NRF_IPV4_ADDRESS=192.168.71.130
+ - NRF_PORT=80
+ - NRF_API_VERSION=v1
+ - NRF_FQDN=oai-nrf
+ - REGISTER_NRF=yes
+ - DISCOVER_UPF=yes
+ - USE_FQDN_DNS=yes
+ - DNN_NI0=oai
+ - DNN_NI2=oai.ipv4
+ depends_on:
+ - oai-nrf
+ - oai-amf
+ volumes:
+ - ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
+ healthcheck:
+ test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
+ interval: 10s
+ timeout: 5s
+ retries: 5
+ networks:
+ public_net:
+ ipv4_address: 192.168.71.133
+ oai-spgwu:
+ container_name: "rfsim5g-oai-spgwu"
+ image: oai-spgwu-tiny:latest
+ environment:
+ - TZ=Europe/Paris
+ - PID_DIRECTORY=/var/run
+ - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
+ - SGW_INTERFACE_NAME_FOR_SX=eth0
+ - PGW_INTERFACE_NAME_FOR_SGI=eth0
+ - NETWORK_UE_NAT_OPTION=yes
+ - NETWORK_UE_IP=12.1.1.0/24
+ - SPGWC0_IP_ADDRESS=192.168.71.133
+ - BYPASS_UL_PFCP_RULES=no
+ - MCC=208
+ - MNC=99
+ - MNC03=099
+ - TAC=1
+ - GTP_EXTENSION_HEADER_PRESENT=yes
+ - GW_ID=1
+ - REALM=openairinterface.org
+ - ENABLE_5G_FEATURES=yes
+ - REGISTER_NRF=yes
+ - USE_FQDN_NRF=yes
+ - UPF_FQDN_5G=oai-spgwu
+ - NRF_IPV4_ADDRESS=192.168.71.130
+ - NRF_PORT=80
+ - NRF_API_VERSION=v1
+ - NRF_FQDN=oai-nrf
+ - NSSAI_SST_0=1
+ - NSSAI_SD_0=1
+ - DNN_0=oai
+ depends_on:
+ - oai-nrf
+ - oai-smf
+ cap_add:
+ - NET_ADMIN
+ - SYS_ADMIN
+ cap_drop:
+ - ALL
+ privileged: true
+ volumes:
+ - ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh
+ healthcheck:
+ test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh"
+ interval: 10s
+ timeout: 5s
+ retries: 5
+ networks:
+ public_net:
+ ipv4_address: 192.168.71.134
+ traffic_net:
+ ipv4_address: 192.168.72.134
+ oai-ext-dn:
+ image: ubuntu:bionic
+ privileged: true
+ container_name: rfsim5g-oai-ext-dn
+ entrypoint: /bin/bash -c \
+ "apt update; apt install -y procps iptables iproute2 iperf iputils-ping;"\
+ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
+ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
+ depends_on:
+ - oai-spgwu
+ networks:
+ traffic_net:
+ ipv4_address: 192.168.72.135
+ healthcheck:
+ test: /bin/bash -c "ping -c 2 192.168.72.134"
+ interval: 10s
+ timeout: 5s
+ retries: 5
+ oai-gnb:
+ image: oai-gnb:develop
+ privileged: true
+ container_name: rfsim5g-oai-gnb
+ environment:
+ RFSIMULATOR: server
+ USE_SA_FDD_MONO: 'yes'
+ GNB_NAME: gnb-rfsim
+ TAC: 1
+ MCC: '208'
+ MNC: '99'
+ MNC_LENGTH: 2
+ NSSAI_SST: 1
+ NSSAI_SD0: 1
+ NSSAI_SD1: 112233
+ AMF_IP_ADDRESS: 192.168.71.132
+ GNB_NGA_IF_NAME: eth0
+ GNB_NGA_IP_ADDRESS: 192.168.71.140
+ GNB_NGU_IF_NAME: eth0
+ GNB_NGU_IP_ADDRESS: 192.168.71.140
+ USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
+ depends_on:
+ - oai-ext-dn
+ networks:
+ public_net:
+ ipv4_address: 192.168.71.140
+ healthcheck:
+ test: /bin/bash -c "pgrep nr-softmodem"
+ interval: 10s
+ timeout: 5s
+ retries: 5
+ oai-nr-ue:
+ image: oai-nr-ue:develop
+ privileged: true
+ container_name: rfsim5g-oai-nr-ue
+ environment:
+ RFSIMULATOR: 192.168.71.140
+ FULL_IMSI: '208990100001100'
+ FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
+ OPC: 'C42449363BBAD02B66D16BC975D77CC1'
+ DNN: oai
+ NSSAI_SST: 1
+ NSSAI_SD: 1
+ USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --band 66 -C 2169080000 --CO -400000000 -s 396 --nokrnmod --log_config.global_log_options level,nocolor,time
+ depends_on:
+ - oai-gnb
+ networks:
+ public_net:
+ ipv4_address: 192.168.71.150
+ healthcheck:
+ test: /bin/bash -c "pgrep nr-uesoftmodem"
+ interval: 10s
+ timeout: 5s
+ retries: 5
+
+networks:
+ public_net:
+ driver: bridge
+ name: rfsim5g-oai-public-net
+ ipam:
+ config:
+ - subnet: 192.168.71.128/26
+ driver_opts:
+ com.docker.network.bridge.name: "rfsim5g-public"
+ traffic_net:
+ driver: bridge
+ name: rfsim5g-oai-traffic-net
+ ipam:
+ config:
+ - subnet: 192.168.72.128/26
+ driver_opts:
+ com.docker.network.bridge.name: "rfsim5g-traffic"
diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/mysql-healthcheck.sh b/ci-scripts/yaml_files/5g_fdd_rfsimulator/mysql-healthcheck.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c92efb9f00a1f69e36dbc8bd410c163bb5d37a97
--- /dev/null
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/mysql-healthcheck.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+set -eo pipefail
+
+if [ "$MYSQL_ROOT_PASSWORD" ] && [ -z "$MYSQL_USER" ] && [ -z "$MYSQL_PASSWORD" ]; then
+ echo >&2 'Healthcheck error: cannot determine root password (and MYSQL_USER and MYSQL_PASSWORD were not set)'
+ exit 0
+fi
+
+host="$(hostname --ip-address || echo '127.0.0.1')"
+user="${MYSQL_USER:-root}"
+export MYSQL_PWD="${MYSQL_PASSWORD:-$MYSQL_ROOT_PASSWORD}"
+
+args=(
+ # force mysql to not use the local "mysqld.sock" (test "external" connectivity)
+ -h"$host"
+ -u"$user"
+ --silent
+)
+
+STATUS=0
+if command -v mysqladmin &> /dev/null; then
+ if mysqladmin "${args[@]}" ping > /dev/null; then
+ database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
+ if [[ -z $database_check ]]; then
+ echo "Healthcheck error: oai_db not populated"
+ STATUS=1
+ fi
+ STATUS=0
+ else
+ echo "Healthcheck error: Mysql port inactive"
+ STATUS=1
+ fi
+else
+ if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
+ database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
+ if [[ -z $database_check ]]; then
+ echo "Healthcheck error: oai_db not populated"
+ STATUS=1
+ fi
+ STATUS=0
+ else
+ echo "Healthcheck error: Mysql port inactive"
+ STATUS=1
+ fi
+fi
+exit $STATUS
diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/nrf-healthcheck.sh b/ci-scripts/yaml_files/5g_fdd_rfsimulator/nrf-healthcheck.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3479c092e8805bf45007d1a4635ee43149786401
--- /dev/null
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/nrf-healthcheck.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+NRF_IP_SBI_INTERFACE=$(ifconfig $NRF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
+NRF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$NRF_IP_SBI_INTERFACE:$NRF_INTERFACE_PORT_FOR_SBI")
+#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
+NB_UNREPLACED_AT=`cat /openair-nrf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+
+if [ $NB_UNREPLACED_AT -ne 0 ]; then
+ STATUS=1
+ echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
+fi
+
+if [[ -z $NRF_SBI_PORT_STATUS ]]; then
+ STATUS=1
+ echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $NRF_INTERFACE_PORT_FOR_SBI is not listening."
+fi
+
+exit $STATUS
\ No newline at end of file
diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/oai_db.sql b/ci-scripts/yaml_files/5g_fdd_rfsimulator/oai_db.sql
new file mode 100755
index 0000000000000000000000000000000000000000..fbd7907a71edd41cc32016f91176b270b8b5bd11
--- /dev/null
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/oai_db.sql
@@ -0,0 +1,217 @@
+-- MySQL dump 10.13 Distrib 5.5.46, for debian-linux-gnu (x86_64)
+--
+-- Host: localhost Database: oai_db
+-- ------------------------------------------------------
+-- Server version 5.5.46-0ubuntu0.14.04.2
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `apn`
+--
+
+DROP TABLE IF EXISTS `apn`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `apn` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `apn-name` varchar(60) NOT NULL,
+ `pdn-type` enum('IPv4','IPv6','IPv4v6','IPv4_or_IPv6') NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `apn-name` (`apn-name`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `apn`
+--
+
+LOCK TABLES `apn` WRITE;
+/*!40000 ALTER TABLE `apn` DISABLE KEYS */;
+/*!40000 ALTER TABLE `apn` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `mmeidentity`
+--
+
+DROP TABLE IF EXISTS `mmeidentity`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mmeidentity` (
+ `idmmeidentity` int(11) NOT NULL AUTO_INCREMENT,
+ `mmehost` varchar(255) DEFAULT NULL,
+ `mmerealm` varchar(200) DEFAULT NULL,
+ `UE-Reachability` tinyint(1) NOT NULL COMMENT 'Indicates whether the MME supports UE Reachability Notifcation',
+ PRIMARY KEY (`idmmeidentity`)
+) ENGINE=MyISAM AUTO_INCREMENT=46 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `mmeidentity`
+--
+
+LOCK TABLES `mmeidentity` WRITE;
+/*!40000 ALTER TABLE `mmeidentity` DISABLE KEYS */;
+INSERT INTO `mmeidentity` VALUES (2,'mme2.openair4G.eur','openair4G.eur',0),(1,'nano.openair4G.eur','openair4G.eur',0),(5,'abeille.openair4G.eur','openair4G.eur',0),(4,'yang.openair4G.eur','openair4G.eur',0),(3,'mme3.openair4G.eur','openair4G.eur',0),(6,'calisson.openair4G.eur','openair4G.eur',0);
+/*!40000 ALTER TABLE `mmeidentity` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `pdn`
+--
+
+DROP TABLE IF EXISTS `pdn`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `pdn` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `apn` varchar(60) NOT NULL,
+ `pdn_type` enum('IPv4','IPv6','IPv4v6','IPv4_or_IPv6') NOT NULL DEFAULT 'IPv4',
+ `pdn_ipv4` varchar(15) DEFAULT '0.0.0.0',
+ `pdn_ipv6` varchar(45) CHARACTER SET latin1 COLLATE latin1_general_ci DEFAULT '0:0:0:0:0:0:0:0',
+ `aggregate_ambr_ul` int(10) unsigned DEFAULT '50000000',
+ `aggregate_ambr_dl` int(10) unsigned DEFAULT '100000000',
+ `pgw_id` int(11) NOT NULL,
+ `users_imsi` varchar(15) NOT NULL,
+ `qci` tinyint(3) unsigned NOT NULL DEFAULT '9',
+ `priority_level` tinyint(3) unsigned NOT NULL DEFAULT '15',
+ `pre_emp_cap` enum('ENABLED','DISABLED') DEFAULT 'DISABLED',
+ `pre_emp_vul` enum('ENABLED','DISABLED') DEFAULT 'DISABLED',
+ `LIPA-Permissions` enum('LIPA-prohibited','LIPA-only','LIPA-conditional') NOT NULL DEFAULT 'LIPA-only',
+ PRIMARY KEY (`id`,`pgw_id`,`users_imsi`),
+ KEY `fk_pdn_pgw1_idx` (`pgw_id`),
+ KEY `fk_pdn_users1_idx` (`users_imsi`)
+) ENGINE=MyISAM AUTO_INCREMENT=60 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `pdn`
+--
+
+LOCK TABLES `pdn` WRITE;
+/*!40000 ALTER TABLE `pdn` DISABLE KEYS */;
+INSERT INTO `pdn` VALUES (1,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930000000001',9,15,'DISABLED','ENABLED','LIPA-only'),(41,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'20834123456789',9,15,'DISABLED','ENABLED','LIPA-only'),(40,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'20810000001234',9,15,'DISABLED','ENABLED','LIPA-only'),(42,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'31002890832150',9,15,'DISABLED','ENABLED','LIPA-only'),(16,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000002',9,15,'DISABLED','ENABLED','LIPA-only'),(43,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'001010123456789',9,15,'DISABLED','ENABLED','LIPA-only'),(2,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930000000002',9,15,'DISABLED','ENABLED','LIPA-only'),(3,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930000000003',9,15,'DISABLED','ENABLED','LIPA-only'),(4,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930000000004',9,15,'DISABLED','ENABLED','LIPA-only'),(5,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930000000005',9,15,'DISABLED','ENABLED','LIPA-only'),(6,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930000000006',9,15,'DISABLED','ENABLED','LIPA-only'),(7,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930000000007',9,15,'DISABLED','ENABLED','LIPA-only'),(8,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208940000000001',9,15,'DISABLED','ENABLED','LIPA-only'),(9,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208940000000002',9,15,'DISABLED','ENABLED','LIPA-only'),(10,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208940000000003',9,15,'DISABLED','ENABLED','LIPA-only'),(11,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208940000000004',9,15,'DISABLED','ENABLED','LIPA-only'),(12,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208940000000005',9,15,'DISABLED','ENABLED','LIPA-only'),(13,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208940000000006',9,15,'DISABLED','ENABLED','LIPA-only'),(14,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208940000000007',9,15,'DISABLED','ENABLED','LIPA-only'),(15,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000001',9,15,'DISABLED','ENABLED','LIPA-only'),(17,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000003',9,15,'DISABLED','ENABLED','LIPA-only'),(18,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000004',9,15,'DISABLED','ENABLED','LIPA-only'),(19,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000005',9,15,'DISABLED','ENABLED','LIPA-only'),(20,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000006',9,15,'DISABLED','ENABLED','LIPA-only'),(21,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000007',9,15,'DISABLED','ENABLED','LIPA-only'),(22,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001100',9,15,'DISABLED','ENABLED','LIPA-only'),(23,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001101',9,15,'DISABLED','ENABLED','LIPA-only'),(24,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001102',9,15,'DISABLED','ENABLED','LIPA-only'),(25,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001103',9,15,'DISABLED','ENABLED','LIPA-only'),(26,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001104',9,15,'DISABLED','ENABLED','LIPA-only'),(27,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001105',9,15,'DISABLED','ENABLED','LIPA-only'),(28,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001106',9,15,'DISABLED','ENABLED','LIPA-only'),(29,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001107',9,15,'DISABLED','ENABLED','LIPA-only'),(30,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001108',9,15,'DISABLED','ENABLED','LIPA-only'),(31,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001109',9,15,'DISABLED','ENABLED','LIPA-only'),(32,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001110',9,15,'DISABLED','ENABLED','LIPA-only'),(33,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930100001111',9,15,'DISABLED','ENABLED','LIPA-only'),(34,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930100001112',9,15,'DISABLED','ENABLED','LIPA-only'),(35,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930100001113',9,15,'DISABLED','ENABLED','LIPA-only'),(44,'operator','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930100001113',9,15,'DISABLED','ENABLED','LIPA-only'),(45,'operator','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930100001112',9,15,'DISABLED','ENABLED','LIPA-only'),(46,'operator','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208930100001111',9,15,'DISABLED','ENABLED','LIPA-only'),(47,'operator','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000002',9,15,'DISABLED','ENABLED','LIPA-only'),(48,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000008',9,15,'DISABLED','ENABLED','LIPA-only'),(49,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000009',9,15,'DISABLED','ENABLED','LIPA-only'),(50,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000010',9,15,'DISABLED','ENABLED','LIPA-only'),(51,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000011',9,15,'DISABLED','ENABLED','LIPA-only'),(52,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000012',9,15,'DISABLED','ENABLED','LIPA-only'),(53,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000013',9,15,'DISABLED','ENABLED','LIPA-only'),(54,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000014',9,15,'DISABLED','ENABLED','LIPA-only'),(55,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208950000000015',9,15,'DISABLED','ENABLED','LIPA-only'),(56,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001118',9,15,'DISABLED','ENABLED','LIPA-only'),(57,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001121',9,15,'DISABLED','ENABLED','LIPA-only'),(58,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001120',9,15,'DISABLED','ENABLED','LIPA-only'),(59,'oai.ipv4','IPv4','0.0.0.0','0:0:0:0:0:0:0:0',50000000,100000000,3,'208920100001119',9,15,'DISABLED','ENABLED','LIPA-only');
+/*!40000 ALTER TABLE `pdn` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `pgw`
+--
+
+DROP TABLE IF EXISTS `pgw`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `pgw` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `ipv4` varchar(15) NOT NULL,
+ `ipv6` varchar(39) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `ipv4` (`ipv4`),
+ UNIQUE KEY `ipv6` (`ipv6`)
+) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `pgw`
+--
+
+LOCK TABLES `pgw` WRITE;
+/*!40000 ALTER TABLE `pgw` DISABLE KEYS */;
+INSERT INTO `pgw` VALUES (1,'127.0.0.1','0:0:0:0:0:0:0:1'),(2,'192.168.56.101',''),(3,'10.0.0.2','0');
+/*!40000 ALTER TABLE `pgw` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `terminal-info`
+--
+
+DROP TABLE IF EXISTS `terminal-info`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `terminal-info` (
+ `imei` varchar(15) NOT NULL,
+ `sv` varchar(2) NOT NULL,
+ UNIQUE KEY `imei` (`imei`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `terminal-info`
+--
+
+LOCK TABLES `terminal-info` WRITE;
+/*!40000 ALTER TABLE `terminal-info` DISABLE KEYS */;
+/*!40000 ALTER TABLE `terminal-info` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `users`
+--
+
+DROP TABLE IF EXISTS `users`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `users` (
+ `imsi` varchar(15) NOT NULL COMMENT 'IMSI is the main reference key.',
+ `msisdn` varchar(46) DEFAULT NULL COMMENT 'The basic MSISDN of the UE (Presence of MSISDN is optional).',
+ `imei` varchar(15) DEFAULT NULL COMMENT 'International Mobile Equipment Identity',
+ `imei_sv` varchar(2) DEFAULT NULL COMMENT 'International Mobile Equipment Identity Software Version Number',
+ `ms_ps_status` enum('PURGED','NOT_PURGED') DEFAULT 'PURGED' COMMENT 'Indicates that ESM and EMM status are purged from MME',
+ `rau_tau_timer` int(10) unsigned DEFAULT '120',
+ `ue_ambr_ul` bigint(20) unsigned DEFAULT '50000000' COMMENT 'The Maximum Aggregated uplink MBRs to be shared across all Non-GBR bearers according to the subscription of the user.',
+ `ue_ambr_dl` bigint(20) unsigned DEFAULT '100000000' COMMENT 'The Maximum Aggregated downlink MBRs to be shared across all Non-GBR bearers according to the subscription of the user.',
+ `access_restriction` int(10) unsigned DEFAULT '60' COMMENT 'Indicates the access restriction subscription information. 3GPP TS.29272 #7.3.31',
+ `mme_cap` int(10) unsigned zerofill DEFAULT NULL COMMENT 'Indicates the capabilities of the MME with respect to core functionality e.g. regional access restrictions.',
+ `mmeidentity_idmmeidentity` int(11) NOT NULL DEFAULT '0',
+ `key` varbinary(16) NOT NULL DEFAULT '0' COMMENT 'UE security key',
+ `RFSP-Index` smallint(5) unsigned NOT NULL DEFAULT '1' COMMENT 'An index to specific RRM configuration in the E-UTRAN. Possible values from 1 to 256',
+ `urrp_mme` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'UE Reachability Request Parameter indicating that UE activity notification from MME has been requested by the HSS.',
+ `sqn` bigint(20) unsigned zerofill NOT NULL,
+ `rand` varbinary(16) NOT NULL,
+ `OPc` varbinary(16) DEFAULT NULL COMMENT 'Can be computed by HSS',
+ PRIMARY KEY (`imsi`,`mmeidentity_idmmeidentity`),
+ KEY `fk_users_mmeidentity_idx1` (`mmeidentity_idmmeidentity`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `users`
+--
+
+LOCK TABLES `users` WRITE;
+/*!40000 ALTER TABLE `users` DISABLE KEYS */;
+INSERT INTO `users` VALUES ('20834123456789','380561234567','35609204079300',NULL,'PURGED',50,40000000,100000000,47,0000000000,1,'+�E��ų\0�,IH��H',0,0,00000000000000000096,'Px�X \Z 1��x��','^��K�����FeU���'),('20810000001234','33611123456','35609204079299',NULL,'PURGED',120,40000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000281454575616225,'\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0','�4�s@���z��~�'),('31002890832150','33638060059','35611302209414',NULL,'PURGED',120,40000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012416,'`�F�݆��D��ϛ���','�4�s@���z��~�'),('001010123456789','33600101789','35609204079298',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'\0 \n \r',1,0,00000000000000000351,'\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0','L�*\\�����^��]� '),('208930000000001','33638030001','35609204079301',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208950000000002','33638050002','35609204079502',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000020471,'\0 \n \r','�4�s@���z��~�'),('208950000000003','33638050003','35609204079503',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012343,'\0 \n \r','�4�s@���z��~�'),('208950000000004','33638050004','35609204079504',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012215,'56f0261d9d051063','�4�s@���z��~�'),('208950000000005','33638050005','35609204079505',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012215,'56f0261d9d051063','�4�s@���z��~�'),('208950000000001','33638050001','35609204079501',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208950000000006','33638050006','35609204079506',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012215,'56f0261d9d051063','�4�s@���z��~�'),('208950000000007','33638050007','35609204079507',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012215,'56f0261d9d051063','�4�s@���z��~�'),('208930000000002','33638030002','35609204079302',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208930000000003','33638030003','35609204079303',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208930000000004','33638030004','35609204079304',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208930000000005','33638030005','35609204079305',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208930000000006','33638030006','35609204079306',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208930000000007','33638030007','35609204079307',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208940000000007','33638040007','35609204079407',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208940000000006','33638040006','35609204079406',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208940000000005','33638040005','35609204079405',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208940000000004','33638040004','35609204079404',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208940000000003','33638040003','35609204079403',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208940000000002','33638040002','35609204079402',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208940000000001','33638040001','35609204079401',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'��wq��gzW�Ð��Z]','�4�s@���z��~�'),('208920100001100','33638020001','35609204079201',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'ebd07771ace8677a','�4�s@���z��~�'),('208920100001101','33638020001','35609204079201',NULL,'NOT_PURGED',120,50000000,100000000,47,0000000000,1,'��k��p~Љu{�K�',1,0,00000281044204937234,'\0 \n \r','�$I6;��+f�k�u�|�'),('208920100001102','33638020002','35609204079202',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'ebd07771ace8677a','�4�s@���z��~�'),('208920100001103','33638020003','35609204079203',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'ebd07771ace8677a','�4�s@���z��~�'),('208920100001104','33638020004','35609204079204',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'ebd07771ace8677a','�4�s@���z��~�'),('208920100001105','33638020005','35609204079205',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'ebd07771ace8677a','�4�s@���z��~�'),('208920100001106','33638020006','35609204079206',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��k��p~Љu{�K�',1,0,00000000000000006103,'ebd07771ace8677a','�$I6;��+f�k�u�|�'),('208920100001107','33638020007','35609204079207',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'ebd07771ace8677a','�4�s@���z��~�'),('208920100001108','33638020008','35609204079208',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'ebd07771ace8677a','�4�s@���z��~�'),('208920100001109','33638020009','35609204079209',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'ebd07771ace8677a','�4�s@���z��~�'),('208920100001110','33638020010','35609204079210',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'ebd07771ace8677a','�4�s@���z��~�'),('208930100001111','33638030011','35609304079211',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'ebd07771ace8677a','�4�s@���z��~�'),('208930100001112','33638030012','35609304079212',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006103,'ebd07771ace8677a','�4�s@���z��~�'),('208930100001113','33638030013','35609304079213',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000006263,'�SNܒ�Iv��e�6','�4�s@���z��~�'),('208950000000008','33638050008','35609204079508',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012215,'56f0261d9d051063','�4�s@���z��~�'),('208950000000009','33638050009','35609204079509',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012215,'56f0261d9d051063','�4�s@���z��~�'),('208950000000010','33638050010','35609204079510',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012215,'56f0261d9d051063','�4�s@���z��~�'),('208950000000011','33638050011','35609204079511',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012215,'56f0261d9d051063','�4�s@���z��~�'),('208950000000012','33638050012','35609204079512',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012215,'56f0261d9d051063','�4�s@���z��~�'),('208950000000013','33638050013','35609204079513',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012215,'56f0261d9d051063','�4�s@���z��~�'),('208950000000014','33638050014','35609204079514',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000012215,'56f0261d9d051063','�4�s@���z��~�'),('208950000000015','33638050015','35609204079515',NULL,'PURGED',120,50000000,100000000,47,0000000000,1,'��G?/����� |hb',1,0,00000000000000000000,'3536663032363164','�4�s@���z��~�'),('208920100001118','33638020010','35609204079210',NULL,'NOT_PURGED',120,50000000,100000000,47,0000000000,1,'��k��p~Љu{�K�',1,0,00000281044204934762,'~?03�u-%�ey�y�','�$I6;��+f�k�u�|�'),('208920100001121','33638020010','35609204079210',NULL,'NOT_PURGED',120,50000000,100000000,47,0000000000,1,'��k��p~Љu{�K�',1,0,00000281044204935293,'&��@xg�]���\n��Vp','�$I6;��+f�k�u�|�'),('208920100001119','33638020010','35609204079210',NULL,'NOT_PURGED',120,50000000,100000000,47,0000000000,1,'��k��p~Љu{�K�',1,0,00000281044204935293,'269482407867805d','�$I6;��+f�k�u�|�'),('208920100001120','33638020010','35609204079210',NULL,'NOT_PURGED',120,50000000,100000000,47,0000000000,1,'��k��p~Љu{�K�',1,0,00000281044204935293,'3236393438323430','�$I6;��+f�k�u�|�');
+INSERT INTO `users` VALUES ('208990100001100','1','55000000000000',NULL,'PURGED',50,40000000,100000000,47,0000000000,1,0xfec86ba6eb707ed08905757b1bb44b8f,0,0,0x40,'ebd07771ace8677a',0xc42449363bbad02b66d16bc975d77cc1);
+INSERT INTO `users` VALUES ('208950000000031','380561234567','55000000000001',NULL,'PURGED',50,40000000,100000000,47,0000000000,1,0x0C0A34601D4F07677303652C0462535B,0,0,0x40,'ebd07771ace8677a',0x63bfa50ee6523365ff14c1f45f88737d);
+INSERT INTO `users` VALUES ('208950000000032','380561234567','55000000000001',NULL,'PURGED',50,40000000,100000000,47,0000000000,1,0x0C0A34601D4F07677303652C0462535B,0,0,0x40,'ebd07771ace8677a',0x63bfa50ee6523365ff14c1f45f88737d);
+INSERT INTO `users` VALUES ('208950000000033','380561234567','55000000000001',NULL,'PURGED',50,40000000,100000000,47,0000000000,1,0x0C0A34601D4F07677303652C0462535B,0,0,0x40,'ebd07771ace8677a',0x63bfa50ee6523365ff14c1f45f88737d);
+INSERT INTO `users` VALUES ('208950000000034','380561234567','55000000000001',NULL,'PURGED',50,40000000,100000000,47,0000000000,1,0x0C0A34601D4F07677303652C0462535B,0,0,0x40,'ebd07771ace8677a',0x63bfa50ee6523365ff14c1f45f88737d);
+INSERT INTO `users` VALUES ('208950000000035','380561234567','55000000000001',NULL,'PURGED',50,40000000,100000000,47,0000000000,1,0x0C0A34601D4F07677303652C0462535B,0,0,0x40,'ebd07771ace8677a',0x63bfa50ee6523365ff14c1f45f88737d);
+INSERT INTO `users` VALUES ('208950000000036','380561234567','55000000000001',NULL,'PURGED',50,40000000,100000000,47,0000000000,1,0x0C0A34601D4F07677303652C0462535B,0,0,0x40,'ebd07771ace8677a',0x63bfa50ee6523365ff14c1f45f88737d);
+INSERT INTO `users` VALUES ('208950000000037','380561234567','55000000000001',NULL,'PURGED',50,40000000,100000000,47,0000000000,1,0x0C0A34601D4F07677303652C0462535B,0,0,0x40,'ebd07771ace8677a',0x63bfa50ee6523365ff14c1f45f88737d);
+INSERT INTO `users` VALUES ('208950000000038','380561234567','55000000000001',NULL,'PURGED',50,40000000,100000000,47,0000000000,1,0x0C0A34601D4F07677303652C0462535B,0,0,0x40,'ebd07771ace8677a',0x63bfa50ee6523365ff14c1f45f88737d);
+INSERT INTO `users` VALUES ('208950000000039','380561234567','55000000000001',NULL,'PURGED',50,40000000,100000000,47,0000000000,1,0x0C0A34601D4F07677303652C0462535B,0,0,0x40,'ebd07771ace8677a',0x63bfa50ee6523365ff14c1f45f88737d);
+INSERT INTO `users` VALUES ('208950000000040','380561234567','55000000000001',NULL,'PURGED',50,40000000,100000000,47,0000000000,1,0x0C0A34601D4F07677303652C0462535B,0,0,0x40,'ebd07771ace8677a',0x63bfa50ee6523365ff14c1f45f88737d);
+/*!40000 ALTER TABLE `users` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2016-06-28 11:41:40
diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/smf-healthcheck.sh b/ci-scripts/yaml_files/5g_fdd_rfsimulator/smf-healthcheck.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d9ff7608e80d8ec5e840e94bcf074d27759c702d
--- /dev/null
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/smf-healthcheck.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+SMF_IP_SBI_INTERFACE=$(ifconfig $SMF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
+SMF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$SMF_IP_SBI_INTERFACE:$SMF_INTERFACE_PORT_FOR_SBI")
+
+#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
+#NB_UNREPLACED_AT=`cat /openair-smf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+
+#if [ $NB_UNREPLACED_AT -ne 0 ]; then
+# STATUS=-1
+# echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
+#fi
+#
+if [[ -z $SMF_SBI_PORT_STATUS ]]; then
+ STATUS=-1
+ echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $SMF_INTERFACE_PORT_FOR_SBI is not listening."
+fi
+
+exit $STATUS
diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/spgwu-healthcheck.sh b/ci-scripts/yaml_files/5g_fdd_rfsimulator/spgwu-healthcheck.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0e3b67ee7e5653a19552ceae70abd36b04a223a7
--- /dev/null
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/spgwu-healthcheck.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+SGW_PORT_FOR_S1U_S12_S4_UP=2152
+SGW_PORT_FOR_SX=8805
+SGW_IP_S1U_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP | grep inet | awk {'print $2'})
+SGW_IP_SX_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_SX | grep inet | awk {'print $2'})
+S1U_S12_S4_UP_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_S1U_INTERFACE:$SGW_PORT_FOR_S1U_S12_S4_UP")
+SX_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_SX_INTERFACE:$SGW_PORT_FOR_SX")
+#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
+NB_UNREPLACED_AT=`cat /openair-spgwu/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+if [ $NB_UNREPLACED_AT -ne 0 ]; then
+ STATUS=1
+ echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
+fi
+
+if [[ -z $S1U_S12_S4_UP_PORT_STATUS ]]; then
+ STATUS=1
+ echo "Healthcheck error: UNHEALTHY S1U port $SGW_PORT_FOR_S1U_S12_S4_UP is not listening."
+fi
+
+if [[ -z $SX_PORT_STATUS ]]; then
+ STATUS=1
+ echo "Healthcheck error: UNHEALTHY SX port $SGW_PORT_FOR_SX is not listening."
+fi
+
+exit $STATUS
\ No newline at end of file
diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
index f0476b0a1efd0ed1932c16ca927e7c9dac926bc0..808be7d83d5f8c370a49c1a91050e2642f700070 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
@@ -241,15 +241,15 @@ services:
NSSAI_SD1: 112233
AMF_IP_ADDRESS: 192.168.71.132
GNB_NGA_IF_NAME: eth0
- GNB_NGA_IP_ADDRESS: 192.168.71.136
+ GNB_NGA_IP_ADDRESS: 192.168.71.140
GNB_NGU_IF_NAME: eth0
- GNB_NGU_IP_ADDRESS: 192.168.71.136
+ GNB_NGU_IP_ADDRESS: 192.168.71.140
USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
depends_on:
- oai-ext-dn
networks:
public_net:
- ipv4_address: 192.168.71.136
+ ipv4_address: 192.168.71.140
healthcheck:
test: /bin/bash -c "pgrep nr-softmodem"
interval: 10s
@@ -260,7 +260,7 @@ services:
privileged: true
container_name: rfsim5g-oai-nr-ue
environment:
- RFSIMULATOR: 192.168.71.136
+ RFSIMULATOR: 192.168.71.140
FULL_IMSI: '208990100001100'
FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
OPC: 'C42449363BBAD02B66D16BC975D77CC1'
@@ -272,7 +272,7 @@ services:
- oai-gnb
networks:
public_net:
- ipv4_address: 192.168.71.137
+ ipv4_address: 192.168.71.150
healthcheck:
test: /bin/bash -c "pgrep nr-uesoftmodem"
interval: 10s
diff --git a/ci-scripts/yaml_files/fr1_epc_20897/mme.conf b/ci-scripts/yaml_files/fr1_epc_20897/mme.conf
index 9dcb44ef2a892c6702780c56ffb3a2aba4e9a658..923bf1c3884234a20d92ff39de84b330e580042d 100644
--- a/ci-scripts/yaml_files/fr1_epc_20897/mme.conf
+++ b/ci-scripts/yaml_files/fr1_epc_20897/mme.conf
@@ -114,7 +114,6 @@ MME :
MME_APP_LOG_LEVEL = "TRACE";
S6A_LOG_LEVEL = "TRACE";
UTIL_LOG_LEVEL = "ERROR";
- MSC_LOG_LEVEL = "ERROR";
ITTI_LOG_LEVEL = "ERROR";
ASN1_VERBOSITY = "annoying";
};
diff --git a/ci-scripts/yaml_files/magma_nsa_20897/mme.conf b/ci-scripts/yaml_files/magma_nsa_20897/mme.conf
index 242b780a40dfd2406ecb004ae8d06d5780f117f9..6bdace2c28c32df422a4c9d5190f5eea58764f35 100644
--- a/ci-scripts/yaml_files/magma_nsa_20897/mme.conf
+++ b/ci-scripts/yaml_files/magma_nsa_20897/mme.conf
@@ -121,7 +121,6 @@ MME :
S11_LOG_LEVEL = "DEBUG";
S6A_LOG_LEVEL = "DEBUG";
UTIL_LOG_LEVEL = "INFO";
- MSC_LOG_LEVEL = "ERROR";
ITTI_LOG_LEVEL = "ERROR";
MME_SCENARIO_PLAYER_LOG_LEVEL = "ERROR";
ASN1_VERBOSITY = "INFO";
diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index b7b365741cb90c9c9a3ec1f196c42ed9bd1ccbf9..7c60d316e101346c9da4ada2e9347440a4751d0a 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -21,8 +21,10 @@
# Author: laurent THOMAS, Lionel GAUTHIER
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 2.8)
+project (OpenAirInterface LANGUAGES C CXX)
+include("macros.cmake")
# System packages that are required
# We use either the cmake buildin, in ubuntu are in: /usr/share/cmake*/Modules/
@@ -48,6 +50,7 @@ include_directories(${CRYPTO_INCLUDE_DIRS})
#uhd 4.0 and iris installs by default in /usr/local
include_directories("/usr/local/include/")
#use native cmake method as this package is not in pkg-config
+add_list2_option(RF_BOARD "None" "RF head type" "None" "OAI_USRP" "OAI_BLADERF" "OAI_LMSSDR" "OAI_SIMU" "EXMIMO")
if (${RF_BOARD} STREQUAL "OAI_USRP")
find_package(Boost REQUIRED)
include_directories(${LIBBOOST_INCLUDE_DIR})
@@ -184,106 +187,6 @@ else (CUDA_FOUND)
message ("No CUDA tool installed")
endif ()
-
-###########################################
-# macros to define options as there is numerous options in oai
-################################################
-macro(add_option name val helpstr)
- if(DEFINED ${name})
- set(value ${${name}})
- else(DEFINED ${name})
- set(value ${val})
- endif()
- set(${name} ${value} CACHE STRING "${helpstr}")
- add_definitions("-D${name}=${value}")
-endmacro(add_option)
-
-macro(add_boolean_option name val helpstr)
- if(DEFINED ${name})
- set(value ${${name}})
- else(DEFINED ${name})
- set(value ${val})
- endif()
- set(${name} ${value} CACHE STRING "${helpstr}")
- set_property(CACHE ${name} PROPERTY TYPE BOOL)
- if (${value})
- add_definitions("-D${name}")
- endif (${value})
-endmacro(add_boolean_option)
-
-macro(add_integer_option name val helpstr)
- if(DEFINED ${name})
- set(value ${${name}})
- else(DEFINED ${name})
- set(value ${val})
- endif()
- set(${name} ${value} CACHE STRING "${helpstr}")
- add_definitions("-D${name}=${value}")
-endmacro(add_integer_option)
-
-macro(add_list1_option name val helpstr)
- if(DEFINED ${name})
- set(value ${${name}})
- else(DEFINED ${name})
- set(value ${val})
- endif()
- set(${name} ${value} CACHE STRING "${helpstr}")
- set_property(CACHE ${name} PROPERTY STRINGS ${ARGN})
- if(NOT "${value}" STREQUAL "False")
- add_definitions("-D${name}=${value}")
- endif()
-endmacro(add_list1_option)
-
-macro(add_list2_option name val helpstr)
- if(DEFINED ${name})
- set(value ${${name}})
- else(DEFINED ${name})
- set(value ${val})
- endif()
- set(${name} ${value} CACHE STRING "${helpstr}")
- set_property(CACHE ${name} PROPERTY STRINGS ${ARGN})
- if(NOT "${value}" STREQUAL "False")
- add_definitions("-D${value}=1")
- endif()
-endmacro(add_list2_option)
-
-macro(add_list_string_option name val helpstr)
- if(DEFINED ${name})
- set(value ${${name}})
- else(DEFINED ${name})
- set(value ${val})
- endif()
- set(${name} ${value} CACHE STRING "${helpstr}")
- set_property(CACHE ${name} PROPERTY STRINGS ${ARGN})
- if(NOT "${value}" STREQUAL "False")
- add_definitions("-D${name}=\"${value}\"")
- endif()
-endmacro(add_list_string_option)
-
-# this function should produce the same value as the macro MAKE_VERSION defined in the C code (file types.h)
-function(make_version VERSION_VALUE)
- math(EXPR RESULT "0")
- foreach (ARG ${ARGN})
- math(EXPR RESULT "${RESULT} * 16 + ${ARG}")
- endforeach()
- set(${VERSION_VALUE} "${RESULT}" PARENT_SCOPE)
-endfunction()
-
-macro(compile_asn1 asn1Source asn1cCmd ResultFlag)
- # Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
- execute_process(COMMAND ${asn1cCmd} ${asn1Source} RESULT_VARIABLE ret)
-
- if (NOT ${ret} STREQUAL 0)
- message(FATAL_ERROR "${ret}: error")
- endif (NOT ${ret} STREQUAL 0)
-
- add_custom_target (
- ${ResultFlag} ALL
- ${asn1cCmd} ${asn1Source}
- DEPENDS ${asn1Source}
- )
-endmacro(compile_asn1)
-
####################################################
# compilation flags
#############################################
@@ -341,10 +244,10 @@ set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR} ${commonOpts} -std=c++11")
-
+add_boolean_option(SANITIZE_ADDRESS False "enable the address sanitizer (ASan)")
if (SANITIZE_ADDRESS)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer -static-libasan -fno-common")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer -static-libasan -fno-common")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fno-common")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fno-common")
endif ()
add_definitions("-DASN_DISABLE_OER_SUPPORT")
@@ -786,9 +689,6 @@ add_library(F1AP ${F1AP_C_FILES} )
add_list1_option(NB_ANTENNAS_RX "4" "Number of antennas in reception" "1" "2" "4")
add_list1_option(NB_ANTENNAS_TX "4" "Number of antennas in transmission" "1" "2" "4")
-add_list2_option(RF_BOARD "EXMIMO" "RF head type" "None" "OAI_USRP" "OAI_BLADERF" "OAI_LMSSDR" "OAI_SIMU")
-
-add_list2_option(TRANSP_PRO "None" "Transport protocol type" "None" "ETHERNET")
#NOKIA config enhancement
set (CONFIG_ROOTDIR
${OPENAIR_DIR}/common/config
@@ -938,10 +838,6 @@ add_boolean_option(CPU_AFFINITY False "Enable CPU Affinity of threads (only vali
add_boolean_option(NAS_NETLINK False "useless ??? Must be True to compile nasmesh driver without rtai ????")
add_boolean_option(OAI_NW_DRIVER_USE_NETLINK True "????")
-add_boolean_option(MESSAGE_CHART_GENERATOR False "For generating sequence diagrams")
-add_boolean_option(MESSAGE_CHART_GENERATOR_RLC_MAC False "trace RLC-MAC exchanges in sequence diagrams")
-add_boolean_option(MESSAGE_CHART_GENERATOR_PHY False "trace some PHY exchanges in sequence diagrams")
-
add_boolean_option(UE_EXPANSION False "enable UE_EXPANSION with max 256 UE")
add_boolean_option(PHY_TX_THREAD False "enable UE_EXPANSION with max 256 UE")
add_boolean_option(PRE_SCD_THREAD False "enable UE_EXPANSION with max 256 UE")
@@ -1019,7 +915,6 @@ add_boolean_option(TRACE_RLC_UM_TX_STATUS False "TRACE for RLC UM, TO BE CHANGE
##########################
#add_boolean_option(LINK_ENB_PDCP_TO_IP_DRIVER False "For eNB, PDCP communicate with a IP driver")
#add_boolean_option(LINK_ENB_PDCP_TO_GTPV1U True "For eNB, PDCP communicate with GTP-U protocol (eNB<->S-GW)")
-add_definitions(-DNEW_GTPU=1)
##########################
# RRC LAYER OPTIONS
@@ -1097,8 +992,7 @@ include_directories("${OPENAIR3_DIR}/S1AP")
include_directories("${OPENAIR2_DIR}/X2AP")
include_directories("${OPENAIR2_DIR}/M2AP")
include_directories("${OPENAIR2_DIR}/F1AP")
-include_directories("${OPENAIR3_DIR}/UDP")
-include_directories("${OPENAIR3_DIR}/GTPV1-U")
+include_directories("${OPENAIR3_DIR}/ocp-gtpu")
include_directories("${OPENAIR3_DIR}/M3AP")
include_directories("${OPENAIR3_DIR}/MME_APP")
include_directories("${OPENAIR_DIR}/targets/COMMON")
@@ -1111,7 +1005,6 @@ include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/S1AP")
include_directories("${OPENAIR2_DIR}/UTIL/OSA")
include_directories("${OPENAIR2_DIR}/UTIL/LFDS/liblfds6.1.1/liblfds611/inc")
include_directories("${OPENAIR2_DIR}/UTIL/LFDS/liblfds7.0.0/liblfds700/inc")
-include_directories("${OPENAIR2_DIR}/LAYER2/PROTO_AGENT")
include_directories("${OPENAIR2_DIR}/UTIL/MEM")
include_directories("${OPENAIR2_DIR}/UTIL/LISTS")
include_directories("${OPENAIR2_DIR}/UTIL/FIFO")
@@ -1124,8 +1017,6 @@ include_directories("${OPENAIR2_DIR}/UTIL/CLI")
include_directories("${OPENAIR2_DIR}/UTIL/OPT")
include_directories("${OPENAIR2_DIR}/UTIL/OMV")
include_directories("${OPENAIR2_DIR}/RRC/LTE/MESSAGES")
-include_directories("${OPENAIR3_DIR}/GTPV1-U/nw-gtpv1u/shared")
-include_directories("${OPENAIR3_DIR}/GTPV1-U/nw-gtpv1u/include")
include_directories("${OPENAIR_DIR}")
# Utilities Library
@@ -1279,18 +1170,6 @@ include_directories (${FSPT_C_DIR})
# set(ASYNC_IF_LIB ASYNC_IF)
# include_directories(${OPENAIR2_DIR}/UTIL/ASYNC_IF)
-add_library(PROTO_AGENT
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_handler.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_common.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_net_comm.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_async.c
- )
-set(PROTO_AGENT_LIB PROTO_AGENT)
-include_directories(${OPENAIR2_DIR}/LAYER2/PROTO_AGENT)
-
-
-
set(PROTOBUF_LIB "protobuf-c")
#set(PROTOBUF_LIB "protobuf") #for Cpp
@@ -1301,11 +1180,6 @@ add_library(HASHTABLE
)
include_directories(${OPENAIR_DIR}/common/utils/hashtable)
-add_library(msc MODULE ${OPENAIR_DIR}/common/utils/msc/msc.c )
-target_link_libraries (msc LFDS)
-
-include_directories(${OPENAIR_DIR}/common/utils/msc)
-
set(UTIL_SRC
# ${OPENAIR2_DIR}/UTIL/CLI/cli.c
# ${OPENAIR2_DIR}/UTIL/CLI/cli_cmd.c
@@ -2161,7 +2035,6 @@ add_library(L2_NR
${MAC_NR_SRC}
${GNB_APP_SRC}
)
-target_compile_definitions(L2_NR PUBLIC NEW_GTPU)
add_library(L2_LTE_NR
${L2_RRC_SRC}
@@ -2169,7 +2042,6 @@ add_library(L2_LTE_NR
${ENB_APP_SRC}
${MCE_APP_SRC}
)
-target_compile_definitions(L2_LTE_NR PUBLIC NEW_GTPU)
add_dependencies(L2_NR rrc_flag nr_rrc_flag s1ap_flag x2_flag)
@@ -2210,32 +2082,14 @@ add_library(CN_UTILS
${OPENAIR3_DIR}/UTILS/mcc_mnc_itu.c
)
-set(GTPV1U_DIR ${OPENAIR3_DIR}/GTPV1-U)
-
-add_library (GTPV1U_OCP
+add_library (GTPV1U
${NR_RRC_DIR}/rrc_gNB_GTPV1U.c
${RRC_DIR}/rrc_eNB_GTPV1U.c
${OPENAIR3_DIR}/ocp-gtpu/gtp_itf.cpp
)
-target_compile_definitions(GTPV1U_OCP PUBLIC NEW_GTPU)
-add_dependencies(GTPV1U_OCP rrc_flag)
+add_dependencies(GTPV1U rrc_flag)
include_directories(${OPENAIR3_DIR}/ocp-gtp)
-#NR case
-set (NR_GTPV1U_SRC
- ${NR_RRC_DIR}/rrc_gNB_GTPV1U.c
- ${RRC_DIR}/rrc_eNB_GTPV1U.c
- ${GTPV1U_DIR}/gtpv1u_eNB.c
- ${GTPV1U_DIR}/gtpv1u_gNB.c
- ${GTPV1U_DIR}/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
- ${GTPV1U_DIR}/nw-gtpv1u/src/NwGtpv1uTrxn.c
- ${GTPV1U_DIR}/nw-gtpv1u/src/NwGtpv1uMsg.c
- ${GTPV1U_DIR}/nw-gtpv1u/src/NwGtpv1u.c
- ${GTPV1U_DIR}/gtpv1u_teid_pool.c
- )
-add_library(NR_GTPV1U ${NR_GTPV1U_SRC})
-add_dependencies(NR_GTPV1U rrc_flag)
-
set (MME_APP_SRC
${OPENAIR3_DIR}/MME_APP/mme_app.c
${OPENAIR3_DIR}/MME_APP/mme_config.c
@@ -2251,9 +2105,6 @@ set(SCTP_SRC
add_library(SCTP_CLIENT ${SCTP_SRC})
add_dependencies(SCTP_CLIENT rrc_flag)
-add_library(UDP ${OPENAIR3_DIR}/UDP/udp_eNB_task.c)
-add_dependencies(UDP rrc_flag)
-
set(NAS_SRC ${OPENAIR3_DIR}/NAS/)
set(libnas_api_OBJS
${NAS_SRC}COMMON/API/NETWORK/as_message.c
@@ -2808,9 +2659,9 @@ add_dependencies(lte-softmodem rrc_flag s1ap_flag x2_flag oai_iqplayer)
target_link_libraries (lte-softmodem
-Wl,--start-group
- RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB M2AP_LIB M2AP_ENB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB GTPV1U_OCP F1AP_LIB F1AP SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_LIB SCHED_RU_LIB
+ RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB M2AP_LIB M2AP_ENB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB GTPV1U F1AP_LIB F1AP SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB LFDS7
- ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB} ${PROTO_AGENT_LIB}
+ ${RAL_LIB} ${NAS_UE_LIB} ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB}
-Wl,--end-group z dl)
target_link_libraries (lte-softmodem ${LIBXML2_LIBRARIES})
@@ -2852,40 +2703,12 @@ add_dependencies(ocp-enb rrc_flag s1ap_flag x2_flag oai_iqplayer coding params_l
target_link_libraries (ocp-enb
-Wl,--start-group
- RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB GTPV1U_OCP SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_LIB SCHED_RU_LIB
+ RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB MISC_NFAPI_LTE_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB LFDS7 SIMU_COMMON
- ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB} ${PROTO_AGENT_LIB}
+ ${RAL_LIB} ${NAS_UE_LIB} ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB}
-Wl,--end-group z dl)
target_link_libraries (ocp-enb ${LIBXML2_LIBRARIES} pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${LIB_LMS_LIBRARIES} ${T_LIB})
-add_executable(cu_test
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/cu_test.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_handler.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_common.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_net_comm.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_async.c
- ${T_SOURCE}
-)
-target_link_libraries(cu_test
- ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FSPT_MSG_LIB} ${PROTOBUF_LIB}
- ${PROTO_AGENT_LIB} pthread UTIL ${T_LIB} dl ITTI
-)
-
-add_executable(du_test
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/du_test.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_handler.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_common.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_net_comm.c
- ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_async.c
- ${T_SOURCE}
-)
-target_link_libraries(du_test
- ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FSPT_MSG_LIB} ${PROTOBUF_LIB}
- ${PROTO_AGENT_LIB} pthread UTIL ${T_LIB} dl ITTI
-)
-
add_executable(oairu
${OPENAIR_TARGETS}/RT/USER/lte-ru.c
${OPENAIR_TARGETS}/RT/USER/ru_control.c
@@ -2946,13 +2769,13 @@ endif()
target_link_libraries (lte-uesoftmodem
-Wl,--start-group
RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB
- SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
+ SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
PHY_UE PHY_RU LFDS L2_UE L2_LTE LFDS7 SIMU_COMMON SIMU NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
- ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${ATLAS_LIBRARIES}
+ ${RAL_LIB} ${NAS_UE_LIB} ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${ATLAS_LIBRARIES}
-Wl,--end-group z dl)
target_link_libraries (lte-uesoftmodem ${LIBXML2_LIBRARIES})
-target_link_libraries (lte-uesoftmodem pthread m ${CONFIG_LIB} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
+target_link_libraries (lte-uesoftmodem pthread m ${CONFIG_LIB} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
target_link_libraries (lte-uesoftmodem ${LIB_LMS_LIBRARIES})
target_link_libraries (lte-uesoftmodem ${T_LIB})
@@ -2988,13 +2811,12 @@ add_executable(nr-softmodem
${OPENAIR2_DIR}/ENB_APP/flexran_agent_ran_api_to_fix.c
)
-target_compile_definitions(nr-softmodem PUBLIC NEW_GTPU)
target_link_libraries (nr-softmodem
-Wl,--start-group
- UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU LFDS GTPV1U_OCP SECU_CN SECU_OSA
- ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} RRC_LIB NR_RRC_LIB
+ UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU LFDS GTPV1U SECU_CN SECU_OSA
+ ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7 ${RAL_LIB} ${NAS_UE_LIB} RRC_LIB NR_RRC_LIB
NGAP_LIB NGAP_GNB S1AP_LIB S1AP_ENB L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
- X2AP_LIB X2AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB ${PROTO_AGENT_LIB} ${FSPT_MSG_LIB}
+ X2AP_LIB X2AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB ${FSPT_MSG_LIB}
-Wl,--end-group z dl)
target_link_libraries (nr-softmodem ${LIBXML2_LIBRARIES})
@@ -3031,8 +2853,8 @@ add_executable(ocp-gnb
target_link_libraries (ocp-gnb
-Wl,--start-group
- UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU LFDS GTPV1U_OCP SECU_CN SECU_OSA
- ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} RRC_LIB NR_RRC_LIB
+ UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU LFDS GTPV1U SECU_CN SECU_OSA
+ ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${RAL_LIB} ${NAS_UE_LIB} RRC_LIB NR_RRC_LIB
NGAP_LIB NGAP_GNB S1AP_LIB S1AP_ENB L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
X2AP_LIB X2AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB SIMU_COMMON
-Wl,--end-group z dl)
@@ -3075,16 +2897,16 @@ add_executable(nr-uesoftmodem
target_link_libraries (nr-uesoftmodem
-Wl,--start-group
- RRC_LIB NR_RRC_LIB NGAP_LIB NGAP_GNB SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
+ RRC_LIB NR_RRC_LIB NGAP_LIB NGAP_GNB SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
PHY_COMMON PHY_NR_COMMON PHY_UE PHY_NR_UE PHY_RU LFDS NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB
NFAPI_USER_LIB MISC_NFAPI_NR_LIB S1AP_LIB S1AP_ENB
- ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${ATLAS_LIBRARIES}
+ ${RAL_LIB} ${NAS_UE_LIB} ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${ATLAS_LIBRARIES}
NFAPI_USER_LIB S1AP_LIB S1AP_ENB
- ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${ATLAS_LIBRARIES} LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB}
+ ${RAL_LIB} ${NAS_UE_LIB} ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${ATLAS_LIBRARIES} LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB}
-Wl,--end-group z dl)
target_link_libraries (nr-uesoftmodem ${LIBXML2_LIBRARIES})
-target_link_libraries (nr-uesoftmodem pthread m ${CONFIG_LIB} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${XFORMS_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
+target_link_libraries (nr-uesoftmodem pthread m ${CONFIG_LIB} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${XFORMS_LIBRARIES} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
target_link_libraries (nr-uesoftmodem ${LIB_LMS_LIBRARIES})
target_link_libraries (nr-uesoftmodem ${T_LIB})
@@ -3329,7 +3151,7 @@ add_executable(test_epc_generate_scenario
${OPENAIR3_DIR}/S1AP/s1ap_eNB_defs.h
)
target_link_libraries (test_epc_generate_scenario
- -Wl,--start-group RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB F1AP_LIB F1AP GTPV1U_OCP LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_LIB PHY LFDS ITTI ${MSC_LIB} L2 -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${CONFIG_LIB}
+ -Wl,--start-group RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB F1AP_LIB F1AP GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB PHY LFDS ITTI L2 -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${CONFIG_LIB}
)
add_executable(test_epc_play_scenario
@@ -3348,7 +3170,7 @@ add_executable(test_epc_play_scenario
)
target_include_directories(test_epc_play_scenario PUBLIC /usr/local/share/asn1c)
target_link_libraries (test_epc_play_scenario
- -Wl,--start-group RRC_LIB S1AP_LIB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB F1AP_LIB F1AP GTPV1U_OCP LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_LIB PHY_NR_COMMON PHY_COMMON PHY PHY_UE LFDS ITTI ${MSC_LIB} -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${CONFIG_LIB}
+ -Wl,--start-group RRC_LIB S1AP_LIB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB F1AP_LIB F1AP GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB PHY_NR_COMMON PHY_COMMON PHY PHY_UE LFDS ITTI -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${CONFIG_LIB}
)
@@ -3389,13 +3211,13 @@ if (${T_TRACER})
ITTI RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB F1AP_LIB F1AP
params_libconfig oai_exmimodevif oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
oai_eth_transpro oai_mobipass tcp_bridge tcp_bridge_oai
- coding FLPT_MSG ASYNC_IF FLEXRAN_AGENT HASHTABLE MSC UTIL OMG_SUMO
+ coding FLPT_MSG ASYNC_IF FLEXRAN_AGENT HASHTABLE UTIL OMG_SUMO
SECU_OSA SECU_CN SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX
L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_NR MAC_UE_NR NGAP_GNB
- CN_UTILS GTPV1U_OCP GTPV1U_OCP SCTP_CLIENT MME_APP UDP LIB_NAS_UE NB_IoT LFDS LFDS7 SIMU_COMMON SIMU SIMU_ETH OPENAIR0_LIB
- ldpc_orig ldpc_optim ldpc_optim8seg ldpc PROTO_AGENT dfts)
+ CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT LFDS LFDS7 SIMU_COMMON SIMU SIMU_ETH OPENAIR0_LIB
+ ldpc_orig ldpc_optim ldpc_optim8seg ldpc dfts)
if (TARGET ${i})
add_dependencies(${i} generate_T)
endif()
@@ -3499,14 +3321,13 @@ add_executable(nr-ittisim
${CONFIG_SOURCES}
${SHLIB_LOADER_SOURCES}
)
-target_compile_definitions(nr-ittisim PUBLIC NEW_GTPU)
target_link_libraries (nr-ittisim
-Wl,--start-group
- UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU LFDS GTPV1U_OCP SECU_CN SECU_OSA
- ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7 ${MSC_LIB} ${RAL_LIB} ${NAS_SIM_LIB} RRC_LIB NR_RRC_LIB
+ UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU LFDS GTPV1U SECU_CN SECU_OSA
+ ITTI ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7 ${RAL_LIB} ${NAS_SIM_LIB} RRC_LIB NR_RRC_LIB
NGAP_LIB NGAP_GNB S1AP_LIB S1AP_ENB L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
- X2AP_LIB X2AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB ${PROTO_AGENT_LIB} ${FSPT_MSG_LIB}
+ X2AP_LIB X2AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB ${FSPT_MSG_LIB}
PHY_NR_UE SCHED_NR_UE_LIB NR_L2_UE
-Wl,--end-group z dl)
diff --git a/cmake_targets/at_commands/CMakeLists.txt b/cmake_targets/at_commands/CMakeLists.txt
index bd71125cf0ac1d920b742f12dccb8b04ffbc671f..dc91f3c31c99a5683be3404a0950b4f5b8a0b591 100755
--- a/cmake_targets/at_commands/CMakeLists.txt
+++ b/cmake_targets/at_commands/CMakeLists.txt
@@ -409,7 +409,6 @@ set(emm_HDR
add_library(emm ${emm_SRC} ${emm_HDR})
target_include_directories(emm PRIVATE
- ${OPENAIR_DIR}/common/utils/msc
${OPENAIR_DIR}/common/utils
${OPENAIR_DIR}/openair2/COMMON
${OPENAIR_NAS_DIR}/UE
@@ -693,7 +692,6 @@ include_directories(
${OPENAIR_TARGETS}/COMMON
${OPENAIR_NAS_DIR}/UE
${OPENAIR_DIR}/common/utils
- ${OPENAIR_DIR}/common/utils/msc
${OPENAIR3_DIR}/COMMON
${OPENAIR3_DIR}/SECU
${OPENAIR_NAS_DIR}/src
diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml
index 3472b14efcf09695f156d57ee6cbd69cc89ff1b3..6450b642989a88e5939233c8bc3ef717165ac96b 100755
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -1069,12 +1069,12 @@
<pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash</pre_exec>
<pre_exec_args></pre_exec_args>
<main_exec> $OPENAIR_DIR/targets/bin/nr_pbchsim.Rel15</main_exec>
- <main_exec_args>-s0 -S1 -n1000 -R106
- -s0 -S1 -n10 -I -R106
- -s0 -S1 -n1000 -R217
- -s0 -S1 -n10 -I -R217
- -s0 -S1 -n1000 -R273
- -s0 -S1 -n10 -I -R273</main_exec_args>
+ <main_exec_args>-s-11 -S-8 -n10 -R106
+ -s-11 -S-8 -n10 -o8000 -I -R106
+ -s-11 -S-8 -n10 -R217
+ -s-11 -S-8 -n10 -o8000 -I -R217
+ -s-11 -S-8 -n10 -R273
+ -s-11 -S-8 -n10 -o8000 -I -R273</main_exec_args>
<tags>nr_pbchsim.test1 nr_pbchsim.test2 nr_pbchsim.test3 nr_pbchsim.test4 nr_pbchsim.test5 nr_pbchsim.test6</tags>
<search_expr_true>PBCH test OK</search_expr_true>
<search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
diff --git a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf
index 7158790b284bc476fc98a1c409ff37101c991135..df4ec5d01ca65341a7fe608717c7f7a68afc379f 100755
--- a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf
@@ -165,19 +165,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
diff --git a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf
index 70819d0e29f117806a37223e7aaf534fecf41283..f9bb8338bf7b1537f3d118c1df571a83db237823 100755
--- a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf
@@ -165,19 +165,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
diff --git a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf
index 7381fefc1a279f050cca6fb81334d941dc97e68f..5c3d9214bc7f6a847a0da42c75cfff11da53d544 100755
--- a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf
@@ -165,19 +165,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
diff --git a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf
index 8eecfa2ac5bbc5017638bbcfd1bb094747c99952..f214f12783a95fdbfab030c3ff56dd6a7c0107d4 100755
--- a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf
@@ -165,19 +165,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
diff --git a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf
index ce2b71bdd2cc5446c5ba3a01841d2ef8585d5f7f..f9f70281cadc0523426e7df24bf4808d81751d7a 100755
--- a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf
@@ -165,19 +165,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
diff --git a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf
index 11e6e244187e1be173e2546795aadcc5521cfacf..87deb031727fd554cd67347324f201d75e1e6c1d 100755
--- a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf
@@ -165,19 +165,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
diff --git a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
index 11f6adbb4d055ab0a2c8595c22ca6923cb16041d..039b1d8aa3f6d871645b925c97ac40ee707e9353 100755
--- a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
+++ b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
@@ -182,19 +182,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
diff --git a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
index 3bf79f94bf279171782fbf6796e6cadb4ae694f0..3c70040bfc0f4b3983206c28434598067e578ceb 100755
--- a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
+++ b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
@@ -182,19 +182,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
diff --git a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
index 67a2bae08c3c55a372ec6d0e0110107bce5fc075..f9d3da2c35ba5e45e31ed963a908b1f5cdb0bfd5 100755
--- a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
+++ b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
@@ -182,19 +182,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
diff --git a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
index 02f29c4c2ed971fff645eb63dfc436ebe37d0100..c4b3e00a75f00c4e05346e67bcec05f2ed22668b 100755
--- a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
+++ b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
@@ -184,19 +184,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
diff --git a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
index 71a479a5126f7da57da0578158d5ff7db94a4b21..e2786ef21cf55ed37432d6febc18370d8b96c04e 100755
--- a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
+++ b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
@@ -184,19 +184,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
diff --git a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
index 09958d62e4b1be8b1081330249802f73592c7c3e..8cd9bd6c677caaa5aa111c1f317d11e5789884e6 100755
--- a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
+++ b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
@@ -184,19 +184,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
);
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 92bcfd88e2e577e27b3d481321e770e1b6d8ed8b..930f2a7f77f6960553c613f85cadc6242bf03bf7 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -39,35 +39,25 @@ conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
XFORMS="True"
SKIP_SHARED_LIB_FLAG="False"
-UE_EXPANSION="False"
PRINT_STATS="False"
-VCD_TIMING="False"
DEADLINE_SCHEDULER_FLAG_USER=""
-CPU_AFFINITY_FLAG_USER="False" #Only valid when low-latency flag is set to False
REL="Rel15"
HW="None"
TP="Ethernet"
EPC=0
VERBOSE_CI=0
VERBOSE_COMPILE=0
-CFLAGS_PROCESSOR_USER=""
RUN_GROUP=0
TEST_CASE_GROUP=""
+BUILD_DIR=ran_build
BUILD_DOXYGEN=0
BUILD_COVERITY_SCAN=0
-T_TRACER="True"
DISABLE_HARDWARE_DEPENDENCY="False"
CMAKE_BUILD_TYPE="RelWithDebInfo"
CMAKE_CMD="$CMAKE"
-UE_AUTOTEST_TRACE="False"
-UE_DEBUG_TRACE="False"
-UE_TIMING_TRACE="False"
-USRP_REC_PLAY="False"
BUILD_ECLIPSE=0
NR="False"
-ITTI_SIM="False"
-SANITIZE_ADDRESS="False"
-OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope msc"
+OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope"
RU=0
trap handle_ctrl_c INT
@@ -82,6 +72,8 @@ Options
Erase all files made by previous compilations, installations
--clean-kernel
Erase previously installed features in kernel: iptables, drivers, ...
+-d | --build-dir
+ Sets build directory (will be <oai-root>/cmake_targets/<build-dir>/build)
-I | --install-external-packages
Installs required packages such as LibXML, asn1.1 compiler, freediameter, ...
This option will require root password
@@ -201,6 +193,9 @@ function main() {
clean_kernel
echo_info "Erased iptables config and removed modules from kernel"
shift;;
+ -d | --build-dir)
+ BUILD_DIR=$2
+ shift;;
-I | --install-external-packages)
INSTALL_EXTERNAL=1
echo_info "Will install external packages"
@@ -275,7 +270,7 @@ function main() {
echo_info "Will compile NR UE"
shift;;
--mu)
- UE_EXPANSION="True"
+ CMAKE_CMD="$CMAKE_CMD -DUE_EXPANSION=True -DPRE_SCD_THREAD=True"
echo_info "Will compile with UE_EXPANSION"
shift;;
--UE-conf-nvram)
@@ -299,7 +294,9 @@ function main() {
*)
echo_fatal "Unknown HW type $HW: exit..."
esac
- echo_info "Setting hardware to: $HW"
+ echo_info "Setting hardware to: $HW"
+ #CMAKE_CMD="$CMAKE_CMD -DRF_BOARD=\"${HW}\""
+ CMAKE_CMD="$CMAKE_CMD -DRF_BOARD=${HW}"
shift 2;;
-t | --transport)
TP=$2
@@ -323,7 +320,7 @@ function main() {
shift 2;;
-V | --vcd)
echo_info "Setting gtk-wave output"
- VCD_TIMING=1
+ CMAKE_CMD="$CMAKE_CMD -DENABLE_VCD_FIFO=True"
EXE_ARGUMENTS="$EXE_ARGUMENTS -V"
shift;;
-x | --xforms)
@@ -348,8 +345,8 @@ function main() {
echo_info "Will compile with verbose instructions"
shift;;
--cflags_processor)
- CFLAGS_PROCESSOR_USER=$2
- echo_info "Setting CPU FLAGS from USER to: $CFLAGS_PROCESSOR_USER"
+ CMAKE_CMD="$CMAKE_CMD -DCFLAGS_PROCESSOR_USER=\"$2\""
+ echo_info "Setting CPU FLAGS from USER to: $2"
shift 2;;
--build-doxygen)
BUILD_DOXYGEN=1
@@ -361,22 +358,26 @@ function main() {
shift;;
--disable-deadline)
DEADLINE_SCHEDULER_FLAG_USER="False"
+ CMAKE_CMD="$CMAKE_CMD -DDEADLINE_SCHEDULER=False"
echo_info "Disabling the usage of deadline scheduler"
shift 1;;
--enable-deadline)
DEADLINE_SCHEDULER_FLAG_USER="True"
+ CMAKE_CMD="$CMAKE_CMD -DDEADLINE_SCHEDULER=True"
echo_info "Enabling the usage of deadline scheduler"
shift 1;;
--enable-cpu-affinity)
CPU_AFFINITY_FLAG_USER="True"
+ CMAKE_CMD="$CMAKE_CMD -DCPU_AFFINITY=True"
echo_info "Enabling CPU Affinity (only valid when not using deadline scheduler)"
shift 1;;
--disable-cpu-affinity)
CPU_AFFINITY_FLAG_USER="False"
+ CMAKE_CMD="$CMAKE_CMD -DCPU_AFFINITY=False"
echo_info "Disabling CPU Affinity (only valid when not using deadline scheduler)"
shift 1;;
--disable-T-Tracer)
- T_TRACER="False"
+ CMAKE_CMD="$CMAKE_CMD -DT_TRACER=False"
echo_info "Disabling the T tracer"
shift 1;;
--disable-hardware-dependency)
@@ -384,15 +385,15 @@ function main() {
DISABLE_HARDWARE_DEPENDENCY="True"
shift 1;;
--ue-autotest-trace)
- UE_AUTOTEST_TRACE="True"
+ CMAKE_CMD="$CMAKE_CMD -DUE_AUTOTEST_TRACE=True"
echo_info "Enabling autotest specific trace for UE"
shift 1;;
--ue-trace)
- UE_DEBUG_TRACE="True"
+ CMAKE_CMD="$CMAKE_CMD -DUE_DEBUG_TRACE=False"
echo_info "Enabling UE trace for debug"
shift 1;;
--ue-timing)
- UE_TIMING_TRACE="True"
+ CMAKE_CMD="$CMAKE_CMD -DUE_TIMING_TRACE=True"
echo_info "Enabling UE timing trace"
shift 1;;
--uhd-images-dir)
@@ -423,24 +424,20 @@ function main() {
fi
fi
shift 2;;
- --usrp-recplay)
- USRP_REC_PLAY="True"
- echo_info "Enabling USRP record playback mode"
- shift 1;;
-k | --skip-shared-libraries)
SKIP_SHARED_LIB_FLAG="True"
echo_info "Skipping build of shared libraries, rfsimulator and transport protocol libraries"
shift;;
- --ninja)
- CMAKE_CMD="$CMAKE_CMD -GNinja"
- MAKE_CMD=ninja
- shift;;
- --sanitize-address | -fsanitize=address)
- SANITIZE_ADDRESS=True
- shift;;
- --ittiSIM)
+ --ninja)
+ CMAKE_CMD="$CMAKE_CMD -GNinja"
+ MAKE_CMD=ninja
+ shift;;
+ --sanitize-address | -fsanitize=address)
+ CMAKE_CMD="$CMAKE_CMD -DSANITIZE_ADDRESS=True"
+ shift;;
+ --ittiSIM)
ittiSIM=1
- ITTI_SIM="True"
+ CMAKE_CMD="$CMAKE_CMD -DITTI_SIM=True"
echo_info "Will compile itti simulator"
shift;;
-h | --help)
@@ -466,9 +463,6 @@ function main() {
fi
fi
- CMAKE_CMD="$CMAKE_CMD .."
- echo_info "CMAKE_CMD=$CMAKE_CMD"
-
########################################################
# Check validity of HW and TP parameters for eNB / gNB #
########################################################
@@ -508,6 +502,7 @@ function main() {
#Disable CPU Affinity for deadline scheduler
if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "True" ] ; then
CPU_AFFINITY_FLAG_USER="False"
+ CMAKE_CMD="$CMAKE_CMD -DCPU_AFFINITY=False"
fi
echo_info "Flags for Deadline scheduler: $DEADLINE_SCHEDULER_FLAG_USER"
@@ -585,46 +580,13 @@ function main() {
echo_info "3. building the compilation directives ..."
DIR=$OPENAIR_DIR/cmake_targets
- if [ "$T_TRACER" = "False" ] ; then
- build_dir=ran_build_noLOG
- else
- build_dir=ran_build
- fi
- [ "$CLEAN" = "1" ] && rm -rf $DIR/$build_dir/build
- mkdir -p $DIR/$build_dir/build
+ [ "$CLEAN" = "1" ] && rm -rf $DIR/$BUILD_DIR/build
+ mkdir -p $DIR/$BUILD_DIR/build
-# configuration module libraries, one currently available, using libconfig
- config_libconfig_shlib=params_libconfig
-
- # first generate the CMakefile in the right directory
- # softmodem compilation
-
- cmake_file=$DIR/$build_dir/CMakeLists.txt
- echo "cmake_minimum_required(VERSION 2.8)" > $cmake_file
- echo "project (OpenAirInterface)" >> $cmake_file
- echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
- echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )" >> $cmake_file
- echo "set ( UE_EXPANSION $UE_EXPANSION )" >> $cmake_file
- # echo "set ( PHY_TX_THREAD $UE_EXPANSION )" >> $cmake_file
- echo "set ( PRE_SCD_THREAD $UE_EXPANSION )" >> $cmake_file
- echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )" >> $cmake_file
- echo "set ( RF_BOARD \"${HW}\")" >> $cmake_file
- echo "set ( TRANSP_PRO \"${TP}\")" >> $cmake_file
- echo "set ( PACKAGE_NAME \"${exec}\")" >> $cmake_file
- echo "set ( DEADLINE_SCHEDULER \"${DEADLINE_SCHEDULER_FLAG_USER}\" )" >> $cmake_file
- echo "set ( CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )" >> $cmake_file
- echo "set ( T_TRACER $T_TRACER )" >> $cmake_file
- echo "set ( UE_AUTOTEST_TRACE $UE_AUTOTEST_TRACE )" >> $cmake_file
- echo "set ( UE_DEBUG_TRACE $UE_DEBUG_TRACE )" >> $cmake_file
- echo "set ( UE_TIMING_TRACE $UE_TIMING_TRACE )" >> $cmake_file
- echo "set ( USRP_REC_PLAY $USRP_REC_PLAY )" >> $cmake_file
- echo "set ( SKIP_SHARED_LIB_FLAG $SKIP_SHARED_LIB_FLAG )" >> $cmake_file
- echo "set ( ITTI_SIM $ITTI_SIM )" >> $cmake_file
- echo "set ( SANITIZE_ADDRESS $SANITIZE_ADDRESS )" >> $cmake_file
- echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
- cd $DIR/$build_dir/build
- eval $CMAKE_CMD
+ cd $DIR/$BUILD_DIR/build
+ echo_info "running $CMAKE_CMD"
+ eval $CMAKE_CMD ../..
execlist=""
if [ "$eNB" = "1" ] ; then
@@ -653,7 +615,7 @@ function main() {
for f in $execlist ; do
echo_info "Compiling $f..."
compilations \
- $build_dir $f \
+ $BUILD_DIR $f \
$f $dbin/$f.$REL
done
@@ -662,13 +624,16 @@ function main() {
if [ "$SKIP_SHARED_LIB_FLAG" = "False" ]; then
echo_info "Building shared libraries common to UE and gNB"
+
+ # configuration module libraries, one currently available, using libconfig
+ config_libconfig_shlib=params_libconfig
compilations \
- $build_dir $config_libconfig_shlib \
+ $BUILD_DIR $config_libconfig_shlib \
lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
compilations \
- $build_dir coding \
+ $BUILD_DIR coding \
libcoding.so $dbin/libcoding.so
fi
@@ -681,7 +646,7 @@ function main() {
then
echo_info "Building ue_ip module"
compilations \
- $build_dir ue_ip \
+ $BUILD_DIR ue_ip \
CMakeFiles/ue_ip/ue_ip.ko $dbin/ue_ip.ko
else
echo_info "Bypassing ue_ip build"
@@ -698,7 +663,7 @@ function main() {
mkdir -p $DIR/nas_sim_tools/build
cd $DIR/nas_sim_tools/build
- eval $CMAKE_CMD
+ eval $CMAKE_CMD ..
compilations \
nas_sim_tools usim \
usim $dbin/usim
@@ -712,16 +677,16 @@ function main() {
# generate USIM data
if [ -f $dbin/conf2uedata ]; then
install_nas_tools $conf_nvram_path $gen_nvram_path "$dlog/conf2uedata.txt"
- echo_info "Copying UE specific part to $DIR/$build_dir/build"
- cp -Rvf $dbin/.ue_emm.nvram0 $DIR/$build_dir/build
- cp -Rvf $dbin/.ue.nvram0 $DIR/$build_dir/build
- cp -Rvf $dbin/.usim.nvram0 $DIR/$build_dir/build
+ echo_info "Copying UE specific part to $DIR/$BUILD_DIR/build"
+ cp -Rvf $dbin/.ue_emm.nvram0 $DIR/$BUILD_DIR/build
+ cp -Rvf $dbin/.ue.nvram0 $DIR/$BUILD_DIR/build
+ cp -Rvf $dbin/.usim.nvram0 $DIR/$BUILD_DIR/build
else
echo_warning "not generated UE NAS files: binaries not found"
fi
fi
- cd $DIR/$build_dir/build
+ cd $DIR/$BUILD_DIR/build
##################
# PHY simulators #
@@ -739,9 +704,6 @@ function main() {
compilations \
ran_build coding \
libcoding.so $dbin/libcoding.so
-# compilations \
-# lte-simulators $config_libconfig_shlib \
-# lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
fi
###################
@@ -763,14 +725,14 @@ function main() {
if [ "$HW" = "EXMIMO" ] ; then
echo_info "Compiling Express MIMO 2 board drivers"
compilations \
- $build_dir openair_rf \
+ $BUILD_DIR openair_rf \
CMakeFiles/openair_rf/openair_rf.ko $dbin/openair_rf.ko
compilations \
- $build_dir updatefw \
+ $BUILD_DIR updatefw \
updatefw $dbin/updatefw
echo_info "Compiling oarf tools. The logfile for compilation is here: $dlog/oarf.txt"
- make -C $OPENAIR_DIR/cmake_targets/$build_dir/build oarf > $dlog/oarf.txt 2>&1
- cp $OPENAIR_DIR/cmake_targets/$build_dir/build/*.oct $dbin
+ make -C $OPENAIR_DIR/cmake_targets/$BUILD_DIR/build oarf > $dlog/oarf.txt 2>&1
+ cp $OPENAIR_DIR/cmake_targets/$BUILD_DIR/build/*.oct $dbin
if [ -s $dbin/oarf_config_exmimo.oct ] ; then
echo_success "oarf tools compiled"
else
@@ -785,7 +747,7 @@ function main() {
if [ ! -z "$BUILD_OPTLIB" ] ; then
for oklib in $BUILD_OPTLIB ; do
compilations \
- $build_dir $oklib \
+ $BUILD_DIR $oklib \
lib${oklib}.so $dbin/lib${oklib}.so
done
fi
@@ -859,7 +821,7 @@ function main() {
# link liboai_device.so with the selected RF device library
if [ "$HW" == "EXMIMO" ] ; then
compilations \
- $build_dir oai_exmimodevif \
+ $BUILD_DIR oai_exmimodevif \
liboai_exmimodevif.so $dbin/liboai_exmimodevif.so.$REL
ln -sf liboai_exmimodevif.so liboai_device.so
@@ -867,7 +829,7 @@ function main() {
echo_info "liboai_device.so is linked to EXMIMO device library"
elif [ "$HW" == "OAI_USRP" ] ; then
compilations \
- $build_dir oai_usrpdevif \
+ $BUILD_DIR oai_usrpdevif \
liboai_usrpdevif.so $dbin/liboai_usrpdevif.so.$REL
ln -sf liboai_usrpdevif.so liboai_device.so
@@ -876,7 +838,7 @@ function main() {
elif [ "$HW" == "OAI_BLADERF" ] ; then
if [ -f "/usr/include/libbladeRF.h" ] ; then
compilations \
- $build_dir oai_bladerfdevif \
+ $BUILD_DIR oai_bladerfdevif \
liboai_bladerfdevif.so $dbin/liboai_bladerfdevif.so.$REL
fi
@@ -886,7 +848,7 @@ function main() {
elif [ "$HW" == "OAI_LMSSDR" ] ; then
# if [ -f "/usr/include/libbladeRF.h" ] ; then
compilations \
- $build_dir oai_lmssdrdevif \
+ $BUILD_DIR oai_lmssdrdevif \
liboai_lmssdrdevif.so $dbin/liboai_lmssdrdevif.so.$REL
# fi
@@ -895,7 +857,7 @@ function main() {
echo_info "liboai_device.so is linked to LMSSDR device library"
elif [ "$HW" == "OAI_IRIS" ] ; then
compilations \
- $build_dir oai_irisdevif \
+ $BUILD_DIR oai_irisdevif \
liboai_irisdevif.so $dbin/liboai_irisdevif.so.$REL
ln -s liboai_irisdevif.so liboai_device.so
@@ -915,7 +877,7 @@ function main() {
echo_info "liboai_device.so is linked to ADRV9371_ZC706 device library for Kernel $SYRIQ_KMAJ.$SYRIQ_KMIN"
elif [ "$HW" == "OAI_AW2SORI" ] ; then
compilations \
- $build_dir aw2sori_transpro \
+ $BUILD_DIR aw2sori_transpro \
libaw2sori_transpro.so $dbin/libaw2sori_transpro.so.$REL
ln -sf libaw2sori_transpro.so libthirdparty_transpro.so
@@ -930,12 +892,12 @@ function main() {
if [ "$SKIP_SHARED_LIB_FLAG" = "False" ]; then
echo_info "Compiling rfsimulator"
compilations \
- $build_dir rfsimulator \
+ $BUILD_DIR rfsimulator \
librfsimulator.so $dbin/librfsimulator.so.$REL
echo_info "Compiling tcp_bridge_oai"
compilations \
- $build_dir tcp_bridge_oai \
+ $BUILD_DIR tcp_bridge_oai \
libtcp_bridge_oai.so $dbin/libtcp_bridge_oai.so.$REL
fi
@@ -946,7 +908,7 @@ function main() {
rm -f $dbin/liboai_transpro.so
if [ "$TP" == "Ethernet" ]; then
compilations \
- $build_dir oai_eth_transpro \
+ $BUILD_DIR oai_eth_transpro \
liboai_eth_transpro.so $dbin/liboai_eth_transpro.so.$REL
ln -sf liboai_eth_transpro.so liboai_transpro.so
ln -sf $dbin/liboai_eth_transpro.so.$REL $dbin/liboai_transpro.so
@@ -954,7 +916,7 @@ function main() {
fi
if [ "$TP" == "benetel4g" ]; then
compilations \
- $build_dir benetel_4g \
+ $BUILD_DIR benetel_4g \
libbenetel_4g.so $dbin/libbenetel_4g.$REL
ln -sf libbenetel_4g.so liboai_transpro.so
ln -sf $dbin/libbenetel_4g.so.$REL $dbin/liboai_transpro.so
@@ -962,7 +924,7 @@ function main() {
fi
if [ "$TP" == "benetel5g" ]; then
compilations \
- $build_dir benetel_5g \
+ $BUILD_DIR benetel_5g \
libbenetel_5g.so $dbin/libbenetel_5g.$REL
ln -sf libbenetel_5g.so liboai_transpro.so
ln -sf $dbin/libbenetel_5g.so.$REL $dbin/liboai_transpro.so
@@ -983,7 +945,7 @@ function main() {
[ "$CLEAN" = "1" ] && rm -rf $OPENAIR_DIR/cmake_targets/doxygen/build
mkdir -p $OPENAIR_DIR/cmake_targets/doxygen/build
cd $OPENAIR_DIR/cmake_targets/doxygen/build
- eval $CMAKE_CMD
+ eval $CMAKE_CMD ..
make doc
) >& $doxygen_log
fi
diff --git a/cmake_targets/epc_test/CMakeLists.template b/cmake_targets/epc_test/CMakeLists.template
index 7a097fffb027f81f94a210f50f8ea37939639bee..28da13437c1465ea19590b1e7f7bedf79e8c4106 100755
--- a/cmake_targets/epc_test/CMakeLists.template
+++ b/cmake_targets/epc_test/CMakeLists.template
@@ -26,7 +26,6 @@ set ( LOG_NO_THREAD True )
set ( DEADLINE_SCHEDULER False )
set ( MAC_CONTEXT 1 )
set ( MAX_NUM_CCs 1 )
-set ( MESSAGE_CHART_GENERATOR False)
set ( MSG_PRINT False )
set ( MU_RECEIVER False )
set ( NAS_ADDRESS_FIX False )
diff --git a/cmake_targets/install_external_packages.ubuntu20 b/cmake_targets/install_external_packages.ubuntu20
index e58f5c9bb16ec52c5ede52a01a0eda26f402fe72..a2f6a9709c31e001bc3772ce9b4ff0dd4e5bfe18 100755
--- a/cmake_targets/install_external_packages.ubuntu20
+++ b/cmake_targets/install_external_packages.ubuntu20
@@ -86,6 +86,7 @@ check_supported_distribution() {
"ubuntu20.04") return 0 ;;
"ubuntu20.10") return 0 ;;
"ubuntu21.04") return 0 ;;
+ "ubuntu21.10") return 0 ;;
esac
return 1
}
@@ -409,7 +410,6 @@ check_install_ubuntu_packages() {
libxml2 \
libxml2-dev \
libxslt1-dev \
- mscgen \
octave-signal \
openssh-client \
openssh-server \
diff --git a/cmake_targets/macros.cmake b/cmake_targets/macros.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..0417420af44757a16a3cefbca84a036615d2fc41
--- /dev/null
+++ b/cmake_targets/macros.cmake
@@ -0,0 +1,98 @@
+###########################################
+# macros to define options as there is numerous options in oai
+################################################
+macro(add_option name val helpstr)
+ if(DEFINED ${name})
+ set(value ${${name}})
+ else(DEFINED ${name})
+ set(value ${val})
+ endif()
+ set(${name} ${value} CACHE STRING "${helpstr}")
+ add_definitions("-D${name}=${value}")
+endmacro(add_option)
+
+macro(add_boolean_option name val helpstr)
+ if(DEFINED ${name})
+ set(value ${${name}})
+ else(DEFINED ${name})
+ set(value ${val})
+ endif()
+ set(${name} ${value} CACHE STRING "${helpstr}")
+ set_property(CACHE ${name} PROPERTY TYPE BOOL)
+ if (${value})
+ add_definitions("-D${name}")
+ endif (${value})
+endmacro(add_boolean_option)
+
+macro(add_integer_option name val helpstr)
+ if(DEFINED ${name})
+ set(value ${${name}})
+ else(DEFINED ${name})
+ set(value ${val})
+ endif()
+ set(${name} ${value} CACHE STRING "${helpstr}")
+ add_definitions("-D${name}=${value}")
+endmacro(add_integer_option)
+
+macro(add_list1_option name val helpstr)
+ if(DEFINED ${name})
+ set(value ${${name}})
+ else(DEFINED ${name})
+ set(value ${val})
+ endif()
+ set(${name} ${value} CACHE STRING "${helpstr}")
+ set_property(CACHE ${name} PROPERTY STRINGS ${ARGN})
+ if(NOT "${value}" STREQUAL "False")
+ add_definitions("-D${name}=${value}")
+ endif()
+endmacro(add_list1_option)
+
+macro(add_list2_option name val helpstr)
+ if(DEFINED ${name})
+ set(value ${${name}})
+ else(DEFINED ${name})
+ set(value ${val})
+ endif()
+ set(${name} ${value} CACHE STRING "${helpstr}")
+ set_property(CACHE ${name} PROPERTY STRINGS ${ARGN})
+ if(NOT "${value}" STREQUAL "False")
+ add_definitions("-D${value}=1")
+ endif()
+endmacro(add_list2_option)
+
+macro(add_list_string_option name val helpstr)
+ if(DEFINED ${name})
+ set(value ${${name}})
+ else(DEFINED ${name})
+ set(value ${val})
+ endif()
+ set(${name} ${value} CACHE STRING "${helpstr}")
+ set_property(CACHE ${name} PROPERTY STRINGS ${ARGN})
+ if(NOT "${value}" STREQUAL "False")
+ add_definitions("-D${name}=\"${value}\"")
+ endif()
+endmacro(add_list_string_option)
+
+# this function should produce the same value as the macro MAKE_VERSION defined in the C code (file types.h)
+function(make_version VERSION_VALUE)
+ math(EXPR RESULT "0")
+ foreach (ARG ${ARGN})
+ math(EXPR RESULT "${RESULT} * 16 + ${ARG}")
+ endforeach()
+ set(${VERSION_VALUE} "${RESULT}" PARENT_SCOPE)
+endfunction()
+
+macro(compile_asn1 asn1Source asn1cCmd ResultFlag)
+ # Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
+ execute_process(COMMAND ${asn1cCmd} ${asn1Source} RESULT_VARIABLE ret)
+
+ if (NOT ${ret} STREQUAL 0)
+ message(FATAL_ERROR "${ret}: error")
+ endif (NOT ${ret} STREQUAL 0)
+
+ add_custom_target (
+ ${ResultFlag} ALL
+ ${asn1cCmd} ${asn1Source}
+ DEPENDS ${asn1Source}
+ )
+endmacro(compile_asn1)
diff --git a/cmake_targets/s1c_mme_test/CMakeLists.template b/cmake_targets/s1c_mme_test/CMakeLists.template
index e62df04bc6f345783c35f0d8749a7af523e1e68f..d2d2d3e05374739e3db21eee9387536a82f36004 100755
--- a/cmake_targets/s1c_mme_test/CMakeLists.template
+++ b/cmake_targets/s1c_mme_test/CMakeLists.template
@@ -26,7 +26,6 @@ set ( LOG_NO_THREAD True )
set ( DEADLINE_SCHEDULER False )
set ( MAC_CONTEXT 1 )
set ( MAX_NUM_CCs 1 )
-set ( MESSAGE_CHART_GENERATOR False)
set ( MSG_PRINT False )
set ( MU_RECEIVER False )
set ( NAS_ADDRESS_FIX False )
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index ec5de6a0d1b4272afafefd37d1a177338e81b95c..55a39c6b2b67e2aa47bf2a3f76efc48374990293 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -765,7 +765,6 @@ check_install_oai_software() {
libxml2 \
libxml2-dev \
libxslt1-dev \
- mscgen \
octave-signal \
openssh-client \
openssh-server \
@@ -793,7 +792,7 @@ check_install_oai_software() {
fi
$SUDO $INSTALLER install -y python-epdb vim-common
else
- $SUDO $INSTALLER install -y mscgen pydb
+ $SUDO $INSTALLER install -y pydb
fi
$SUDO $INSTALLER install -y \
diff --git a/cmake_targets/tools/example_enb_exmimo_mme_hss.txt b/cmake_targets/tools/example_enb_exmimo_mme_hss.txt
index 238554f8e2a71ccb667c537d5086c0e99c40a442..b55266dfe7aaae9a3da16b770a9219c143efda42 100755
--- a/cmake_targets/tools/example_enb_exmimo_mme_hss.txt
+++ b/cmake_targets/tools/example_enb_exmimo_mme_hss.txt
@@ -85,18 +85,7 @@ Tools available:
1) itti_analyser (list messages exchanged between protocol layers)
2) xforms (Layer 1)
-3) mscgen (under construction, but can give some results now)
- (http://www.mcternan.me.uk/mscgen/)
- We use the software to generate sequence diagrams
- with traces generated during the execution of the eNB.
- After the enb execution:
- yang@yang:...$ cd /tmp
- yang@yang:/tmp$ /home/yang/openair4G/trunk/targets/SCRIPTS/msc_gen.py
- The results are located in the current directory (/tmp in this example) in a folder. The name of the folder
- is the current date (for example: 2015-04-08_20.34.10).
- The results are input files for the mscgen tool containing events or messages and the
- corresponding generated png files.
-4) vcd (timing mesurements)
+3) vcd (timing mesurements)
diff --git a/cmake_targets/tools/example_oaisim_enb_ue_mme_virtual.txt b/cmake_targets/tools/example_oaisim_enb_ue_mme_virtual.txt
index 9996a53e1907cf3ddd75550187c984917d9158f7..805d121e6dd50c6cf7ee71b97a1816ca744f5d78 100755
--- a/cmake_targets/tools/example_oaisim_enb_ue_mme_virtual.txt
+++ b/cmake_targets/tools/example_oaisim_enb_ue_mme_virtual.txt
@@ -92,18 +92,7 @@ Tools available:
1) itti_analyser (list messages exchanged between protocol layers)
2) xforms (Layer 1)
-3) mscgen (under construction, but can give some results now)
- (http://www.mcternan.me.uk/mscgen/)
- We use the software to generate sequence diagrams
- with traces generated during the execution of the eNB.
- After the enb execution:
- yang@yang:...$ cd /tmp
- yang@yang:/tmp$ /home/yang/openair4G/trunk/targets/SCRIPTS/msc_gen.py
- The results are located in the current directory (/tmp in this example) in a folder. The name of the folder
- is the current date (for example: 2015-04-08_20.34.10).
- The results are input files for the mscgen tool containing events or messages and the
- corresponding generated png files.
-4) vcd (timing mesurements)
+3) vcd (timing mesurements)
diff --git a/cmake_targets/tools/run_enb_s1_usrp b/cmake_targets/tools/run_enb_s1_usrp
index 1a4c6b10b8381a367762e8032ae5235aa68e8a6a..db22e31493dd20eb338b3f968e25514d0bb1681c 100755
--- a/cmake_targets/tools/run_enb_s1_usrp
+++ b/cmake_targets/tools/run_enb_s1_usrp
@@ -32,8 +32,6 @@
################################
THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
source $THIS_SCRIPT_PATH/build_helper
-declare -i g_run_msc_gen=0
-declare g_msc_dir="/tmp"
function help()
@@ -55,7 +53,6 @@ function help()
echo_error " -M, --target-dl-mcs mcs Downlink target MCS."
echo_error " -n, --T-no-wait don't wait for tracer, start immediately"
echo_error " -p, --T-port port use given port"
- echo_error " -m, --mscgen directory Generate mscgen output files in a directory"
echo_error " -s, --show-stdout Do not redirect stdout and stderr to file /tmp/lte_softmodem.stdout.txt."
echo_error " -S, --enable-missed-slot Continue execution in case of missed slot."
echo_error " -T, --target-ul-mcs mcs Uplink target MCS."
@@ -68,30 +65,10 @@ function help()
}
-function do_msc_gen()
-{
- cd $g_msc_dir
- last_created_file=`ls -t mscgen* | head -1 | tr -d ':'`
- $OPENAIR_DIR/targets/SCRIPTS/msc_gen.py
- sync
- last_created_file2=`ls -t mscgen* | head -1 | tr -d ':'`
-
- if [ x"$last_created_file" != x"$last_created_file2" ]; then
- if [ -f ./$last_created_file2/oai_mscgen_page_0.png ]; then
- command -v eog 2>/dev/null && eog ./$last_created_file2/oai_mscgen_page_0.png
- fi
- fi
-
-}
-
-
function control_c()
# run if user hits control-c
{
echo_warning "\nExiting by ctrl+c\n"
- if [ $g_run_msc_gen -eq 1 ]; then
- do_msc_gen
- fi
exit $?
}
@@ -153,18 +130,6 @@ function main()
exe_arguments="$exe_arguments --rf-config-file=$rf_config_file"
fi
;;
- -m | --mscgen)
- g_msc_dir=$2
- # can omit file name if last arg on the line
- if [ -d "$g_msc_dir" ]; then
- echo "setting mscgen log files to dir: $g_msc_dir"
- g_run_msc_gen=1
- shift 2;
- else
- echo_error "Mscgen log dir does not exist"
- exit -1
- fi
- ;;
-M | --target-dl-mcs)
echo "setting target dl MCS to $2"
exe_arguments="$exe_arguments -m $2"
@@ -251,9 +216,6 @@ function main()
else
gdb -n -x ~/.gdb_lte_softmodem
fi
- if [ $g_run_msc_gen -eq 1 ]; then
- do_msc_gen
- fi
fi
}
diff --git a/cmake_targets/tools/run_enb_ue_virt_noS1 b/cmake_targets/tools/run_enb_ue_virt_noS1
index 79d5bc35dc1586fbbde90762affd87a718f50c91..5f8e7e5374ca047f333688f4b9de6995b13fdeec 100755
--- a/cmake_targets/tools/run_enb_ue_virt_noS1
+++ b/cmake_targets/tools/run_enb_ue_virt_noS1
@@ -57,7 +57,6 @@ function help()
echo_error " -l, --log-level set the global log level (8:trace, 7:debug, 6:info, 4:warn, 3:error). Note that the log configuration is eNB config file is ignored for oaisim."
echo_error " -h, --help Print this help."
echo_error " -K, --itti-dump-file filename ITTI dump file containing all ITTI events occuring during EPC runtime.(can omit file name if last argument)"
- echo_error " -m, --mscgen directory Generate mscgen output files in a directory"
echo_error " -V, --vcd Dump timings of processing in a GTKWave compliant file format."
echo_error " -W, --wireshark-l2 Dump MAC frames for visualization with wireshark."
echo_error " You need to open Wireshark, open the preferences, and check try heuristics for the UDP protocol, MAC-LTE, RLC-LTE,"
@@ -75,11 +74,9 @@ function main()
cecho "OPENAIR_DIR = $OPENAIR_DIR" $green
local -i run_gdb=0
- local -i run_mscgen=0
local exe_arguments=""
local DEFAULT_CONFIG_FILE_ENB=$OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_no_mme.conf
local CONFIG_FILE_ENB=$DEFAULT_CONFIG_FILE_ENB
- local MSC_DIR="/tmp"
local abstraction_flag=0
until [ -z "$1" ]
@@ -136,17 +133,6 @@ function main()
exe_arguments="$exe_arguments -K $ITTI_DUMP_FILE"
;;
- -m | --mscgen)
- MSC_DIR=$2
- if [ -d "$MSC_DIR" ]; then
- echo "setting mscgen log files to dir: $MSC_DIR"
- run_mscgen=1
- shift 2;
- else
- echo_error "Mscgen log dir does not exist"
- exit -1
- fi
- ;;
# -u | --num-ue )
-V | --vcd)
@@ -212,10 +198,6 @@ function main()
cd $OPENAIR_DIR/targets/bin
- if [ $run_mscgen -eq 1 ]; then
- $SUDO rm -f /tmp/openair.msc.*
- fi
-
if [ $run_gdb -eq 0 ]; then
exec $SUDO $OPENAIR_DIR/targets/bin/oaisim_nos1.Rel14 $exe_arguments | tee /tmp/enb_ue_nos1.log.txt
else
@@ -227,20 +209,6 @@ function main()
cat ~/.gdb_enb_ue_nos1
$SUDO gdb -n -x ~/.gdb_enb_ue_nos1
fi
-
- if [ $run_mscgen -eq 1 ]; then
- cd $MSC_DIR
- last_created_file=`ls -t mscgen* | head -1 | tr -d ':'`
- $OPENAIR_DIR/targets/SCRIPTS/msc_gen.py --profile E_UTRAN
- sync
- last_created_file2=`ls -t mscgen* | head -1 | tr -d ':'`
-
- if [ x"$last_created_file" != x"$last_created_file2" ]; then
- if [ -f ./$last_created_file2/oai_mscgen_page_0.png ]; then
- command -v eog 2>/dev/null && eog ./$last_created_file2/oai_mscgen_page_0.png
- fi
- fi
- fi
}
main "$@"
diff --git a/cmake_targets/tools/run_enb_ue_virt_s1 b/cmake_targets/tools/run_enb_ue_virt_s1
index 50fc819ec869b243da177435bcc19ea6a571dd7d..76bc3c2b39f6d2760cbb816101d7dd05456248f8 100755
--- a/cmake_targets/tools/run_enb_ue_virt_s1
+++ b/cmake_targets/tools/run_enb_ue_virt_s1
@@ -81,7 +81,6 @@ function help()
echo_error " -g, --gdb Run with GDB."
echo_error " -h, --help Print this help."
echo_error " -K, --itti-dump-file filename ITTI dump file containing all ITTI events occuring during EPC runtime.(can omit file name if last argument)"
- echo_error " -m, --mscgen directory Generate mscgen output files in a directory"
echo_error " -V, --vcd Dump timings of processing in a GTKWave compliant file format."
echo_error " -W, --wireshark-l2 Dump MAC frames for visualization with wireshark."
echo_error " You need to open Wireshark, open the preferences, and check try heuristics for the UDP protocol, MAC-LTE, RLC-LTE,"
@@ -100,11 +99,9 @@ function main()
cecho "OPENAIR_DIR = $OPENAIR_DIR" $green
local -i run_gdb=0
- local -i run_mscgen=0
local exe_arguments=""
local DEFAULT_CONFIG_FILE_ENB=$OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_mme.conf
local CONFIG_FILE_ENB=$DEFAULT_CONFIG_FILE_ENB
- local MSC_DIR="/tmp"
until [ -z "$1" ]
do
@@ -160,19 +157,6 @@ function main()
exe_arguments="$exe_arguments -K $ITTI_DUMP_FILE"
;;
- -m | --mscgen)
- MSC_DIR=$2
- # can omit file name if last arg on the line
- if [ -d "$MSC_DIR" ]; then
- echo "setting mscgen log files to dir: $MSC_DIR"
- run_mscgen=1
- shift 2;
- else
- echo_error "Mscgen log dir does not exist"
- exit -1
- fi
- ;;
-
-V | --vcd)
echo "setting gtk-wave output"
exe_arguments="$exe_arguments -V /tmp/oai_gtk_wave.vcd"
@@ -258,10 +242,6 @@ function main()
cd $OPENAIR_DIR/targets/bin
- if [ $run_mscgen -eq 1 ]; then
- rm -f /tmp/openair.msc.*
- fi
-
if [ $run_gdb -eq 0 ]; then
exec $OPENAIR_DIR/targets/bin/oaisim.Rel14 $exe_arguments | tee /tmp/enb_ue_s1.log.txt
else
@@ -273,21 +253,6 @@ function main()
cat ~/.gdb_enb_ue_s1
gdb -n -x ~/.gdb_enb_ue_s1
fi
-
- if [ $run_mscgen -eq 1 ]; then
- cd $MSC_DIR
- last_created_file=`ls -t mscgen* | head -1 | tr -d ':'`
- $OPENAIR_DIR/targets/SCRIPTS/msc_gen.py --profile E_UTRAN
- sync
- last_created_file2=`ls -t mscgen* | head -1 | tr -d ':'`
-
- if [ x"$last_created_file" != x"$last_created_file2" ]; then
- if [ -f ./$last_created_file2/oai_mscgen_page_0.png ]; then
- command -v eog 2>/dev/null && eog ./$last_created_file2/oai_mscgen_page_0.png
- fi
- fi
- fi
-
}
sudo echo
diff --git a/common/config/DOC/config/rtusage.md b/common/config/DOC/config/rtusage.md
index 10cbee24950bb3972f80118745f4efb65a50b516..8db58ddac35d7add615d73dde499a2c86a514343 100644
--- a/common/config/DOC/config/rtusage.md
+++ b/common/config/DOC/config/rtusage.md
@@ -65,7 +65,6 @@ To get help on supported parameters you can use specific options:
-R: Enable online log
-g: Set the global log level, valide options: (4:trace, 3:debug, 2:info, 1:warn, (0:error))
--telnetsrv: Start embedded telnet server
- --msc: Enable the MSC tracing utility
--------------------------------------------------------------------
[LIBCONFIG] loader: 2/2 parameters successfully set, (2 to default value)
diff --git a/common/ran_context.h b/common/ran_context.h
index db981e9182f31405019a5a9ffc767b54dd0d3c48..055c6f783e562563519b161706ec06098c918b11 100644
--- a/common/ran_context.h
+++ b/common/ran_context.h
@@ -42,17 +42,11 @@
//#include "ENB_APP/enb_config.h"
#include "flexran_agent_defs.h"
-#include "gtpv1u.h"
-#include "NwGtpv1u.h"
-#include "NwGtpv1uMsg.h"
-#include "NwGtpv1uPrivate.h"
-#include "gtpv1u_eNB_defs.h"
-#include "gtpv1u_gNB_defs.h"
-
#include "PHY/defs_L1_NB_IoT.h"
#include "RRC/LTE/defs_NB_IoT.h"
#include "RRC/LTE/rrc_defs.h"
#include "RRC/NR/nr_rrc_defs.h"
+#include <openair3/ocp-gtpu/gtpv1u_eNB_task.h>
typedef struct {
@@ -110,8 +104,6 @@ typedef struct {
struct gNB_MAC_INST_s **nrmac;
/// GTPu descriptor
gtpv1u_data_t *gtpv1u_data_g;
- /// NR GTPu descriptor
- nr_gtpv1u_data_t *nr_gtpv1u_data_g;
/// RU descriptors. These describe what each radio unit is supposed to do and contain the necessary functions for fronthaul interfaces
struct RU_t_s **ru;
/// Mask to indicate fronthaul setup status of RU (hard-limit to 64 RUs)
diff --git a/common/utils/LOG/DOC/rtusage.md b/common/utils/LOG/DOC/rtusage.md
index 041c29e688ecea97e84b99e97b27e6e018bb76d2..2f6fa5e6ea907b7634a0bfa1b4c5101e452e365c 100644
--- a/common/utils/LOG/DOC/rtusage.md
+++ b/common/utils/LOG/DOC/rtusage.md
@@ -49,7 +49,6 @@ The list of components defined within oai can be retrieved from the [config mod
[CONFIG] log_config.perf_log_level set to default value "info"
[CONFIG] log_config.oip_log_level set to default value "info"
[CONFIG] log_config.cli_log_level set to default value "info"
-[CONFIG] log_config.msc_log_level set to default value "info"
[CONFIG] log_config.ocm_log_level set to default value "info"
[CONFIG] log_config.udp_log_level set to default value "info"
[CONFIG] log_config.gtpv1u_log_level set to default value "info"
@@ -108,8 +107,6 @@ The list of components defined within oai can be retrieved from the [config mod
[CONFIG] log_config.oip_log_infile set to default value
[CONFIG] cli_log_infile: 0
[CONFIG] log_config.cli_log_infile set to default value
-[CONFIG] msc_log_infile: 0
-[CONFIG] log_config.msc_log_infile set to default value
[CONFIG] ocm_log_infile: 0
[CONFIG] log_config.ocm_log_infile set to default value
[CONFIG] udp_log_infile: 0
diff --git a/common/utils/LOG/log.c b/common/utils/LOG/log.c
index 29e4f718c699e90998225159b1c0a1a4890e8114..5b047c082d057b2bcd795a7d9c98084b5ad34fd3 100644
--- a/common/utils/LOG/log.c
+++ b/common/utils/LOG/log.c
@@ -411,6 +411,16 @@ int register_log_component(char *name,
return computed_compidx;
}
+static void unregister_all_log_components(void)
+{
+ log_component_t* lc = &g_log->log_component[0];
+ while (lc->name) {
+ free((char *)lc->name); // defined as const, but assigned through strdup()
+ free(lc->filelog_name);
+ lc++;
+ }
+}
+
int isLogInitDone (void)
{
if (g_log == NULL)
@@ -449,7 +459,6 @@ int logInit (void)
register_log_component("OCG","",OCG);
register_log_component("PERF","",PERF);
register_log_component("OIP","",OIP);
- register_log_component("MSC","log",MSC);
register_log_component("OCM","log",OCM);
register_log_component("HW","",HW);
register_log_component("OSA","",OSA);
@@ -503,6 +512,12 @@ int logInit (void)
return 0;
}
+void logTerm(void)
+{
+ unregister_all_log_components();
+ free_and_zero(g_log);
+}
+
#include <sys/syscall.h>
static inline int log_header(log_component_t *c,
char *log_buffer,
diff --git a/common/utils/LOG/log.h b/common/utils/LOG/log.h
index 46c73427c183910010233a1c18fbc8590cefe4cf..d73fc03ed93be535ef8a55f4f04c44932eb14111 100644
--- a/common/utils/LOG/log.h
+++ b/common/utils/LOG/log.h
@@ -212,7 +212,6 @@ typedef enum {
PERF,
OIP,
CLI,
- MSC,
OCM,
UDP_,
GTPU,
@@ -303,6 +302,7 @@ extern "C" {
# include "log_if.h"
/*----------------------------------------------------------------------------*/
int logInit (void);
+void logTerm (void);
int isLogInitDone (void);
void logRecord_mt(const char *file, const char *func, int line,int comp, int level, const char *format, ...) __attribute__ ((format (printf, 6, 7)));
void vlogRecord_mt(const char *file, const char *func, int line, int comp, int level, const char *format, va_list args );
diff --git a/common/utils/T/tracer/macpdu2wireshark.c b/common/utils/T/tracer/macpdu2wireshark.c
index a024f181458b88186ad15490e71d302b469219e9..195bf333358d9ce5c2190e7ce092df49c13c8555 100644
--- a/common/utils/T/tracer/macpdu2wireshark.c
+++ b/common/utils/T/tracer/macpdu2wireshark.c
@@ -362,16 +362,6 @@ void nr_dl_retx(void *_d, event e)
e.e[d->nr_dl_retx_data].bsize, NO_PREAMBLE);
}
-void nr_dl_retx(void *_d, event e)
-{
- ev_data *d = _d;
-
- trace_nr(d, NR_DIRECTION_DOWNLINK, NR_C_RNTI, e.e[d->nr_dl_retx_rnti].i,
- e.e[d->nr_dl_retx_frame].i, e.e[d->nr_dl_retx_slot].i,
- e.e[d->nr_dl_retx_data].b, e.e[d->nr_dl_retx_data].bsize,
- NO_PREAMBLE);
-}
-
void nr_mib(void *_d, event e)
{
ev_data *d = _d;
@@ -579,20 +569,6 @@ void setup_data(ev_data *d, void *database, int ul_id, int dl_id, int mib_id,
d->nr_dl_retx_data == -1)
goto error;
- /* NR dl retx: rnti, frame, slot, data */
- f = get_format(database, nr_dl_retx_id);
-
- for (i = 0; i < f.count; i++) {
- G("rnti", "int", d->nr_dl_retx_rnti);
- G("frame", "int", d->nr_dl_retx_frame);
- G("slot", "int", d->nr_dl_retx_slot);
- G("data", "buffer", d->nr_dl_retx_data);
- }
-
- if (d->nr_dl_retx_rnti == -1 || d->nr_dl_retx_frame == -1 ||
- d->nr_dl_retx_slot == -1 || d->nr_dl_retx_data == -1)
- goto error;
-
/* NR MIB: frame, slot, data */
f = get_format(database, nr_mib_id);
diff --git a/common/utils/assertions.h b/common/utils/assertions.h
index d85dab79a0c744f7d8cda566caa66638a2e9f34b..573036b1d949e23730cb15cc44d46e3023305d9f 100644
--- a/common/utils/assertions.h
+++ b/common/utils/assertions.h
@@ -25,14 +25,21 @@
#include <stdio.h>
#include <stdlib.h>
#include <inttypes.h>
+#include <sys/types.h>
+#include <unistd.h>
#include <platform_types.h>
#include "backtrace.h"
-#define _Assert_Exit_ \
- fprintf(stderr, "\nExiting execution\n"); \
- fflush(stdout); \
- fflush(stderr); \
- abort();
+#define _Assert_Exit_ \
+ if (getenv("gdbStacks")) { \
+ char tmp [1000]; \
+ sprintf(tmp,"gdb -ex='set confirm off' -ex 'thread apply all bt' -ex q -p %d < /dev/null", getpid()); \
+ __attribute__((unused)) int dummy=system(tmp); \
+ } \
+ fprintf(stderr, "\nExiting execution\n"); \
+ fflush(stdout); \
+ fflush(stderr); \
+ abort();
#define _Assert_(cOND, aCTION, fORMAT, aRGS...) \
do { \
diff --git a/common/utils/load_module_shlib.c b/common/utils/load_module_shlib.c
index 2b0d339358e78c0985f1ed000199f1658960157c..1c9aa8cab9ab27c0faa1e0073f32ae80f981901e 100644
--- a/common/utils/load_module_shlib.c
+++ b/common/utils/load_module_shlib.c
@@ -69,7 +69,6 @@ char *loader_format_shlibpath(char *modname, char *version)
char *tmpstr;
char *shlibpath =NULL;
char *shlibversion=NULL;
-char *cfgprefix;
paramdef_t LoaderParams[] ={{"shlibpath", NULL, 0, strptr:&shlibpath, defstrval:NULL, TYPE_STRING, 0, NULL},
{"shlibversion", NULL, 0, strptr:&shlibversion, defstrval:"", TYPE_STRING, 0, NULL}};
@@ -81,16 +80,11 @@ int ret;
/* looks for specific path for this module in the config file */
/* specific value for a module path and version is located in a modname subsection of the loader section */
/* shared lib name is formatted as lib<module name><module version>.so */
- cfgprefix = malloc(sizeof(LOADER_CONFIG_PREFIX)+strlen(modname)+16);
- if (cfgprefix == NULL) {
- fprintf(stderr,"[LOADER] %s %d malloc error loading module %s, %s\n",__FILE__, __LINE__, modname, strerror(errno));
- exit_fun("[LOADER] unrecoverable error");
- } else {
- sprintf(cfgprefix,LOADER_CONFIG_PREFIX ".%s",modname);
- int ret = config_get( LoaderParams,sizeof(LoaderParams)/sizeof(paramdef_t),cfgprefix);
- if (ret <0) {
- fprintf(stderr,"[LOADER] %s %d couldn't retrieve config from section %s\n",__FILE__, __LINE__,cfgprefix);
- }
+ char cfgprefix[sizeof(LOADER_CONFIG_PREFIX)+strlen(modname)+16];
+ sprintf(cfgprefix,LOADER_CONFIG_PREFIX ".%s",modname);
+ ret = config_get( LoaderParams,sizeof(LoaderParams)/sizeof(paramdef_t),cfgprefix);
+ if (ret <0) {
+ fprintf(stderr,"[LOADER] %s %d couldn't retrieve config from section %s\n",__FILE__, __LINE__,cfgprefix);
}
/* no specific path, use loader default shared lib path */
if (shlibpath == NULL) {
@@ -142,6 +136,7 @@ int load_module_version_shlib(char *modname, char *version, loader_shlibfunc_t *
}
shlib_path = loader_format_shlibpath(modname, version);
+ printf("shlib_path %s\n", shlib_path);
for (int i = 0; i < loader_data.numshlibs; i++) {
if (strcmp(loader_data.shlibs[i].name, modname) == 0) {
@@ -198,15 +193,17 @@ int load_module_version_shlib(char *modname, char *version, loader_shlibfunc_t *
}
if (farray) {
- if (!loader_data.shlibs[lib_idx].funcarray) {
- loader_data.shlibs[lib_idx].funcarray = malloc(numf*sizeof(loader_shlibfunc_t));
- if (!loader_data.shlibs[lib_idx].funcarray) {
+ loader_shlibdesc_t *shlib = &loader_data.shlibs[lib_idx];
+ if (!shlib->funcarray) {
+ shlib->funcarray = calloc(numf, sizeof(loader_shlibfunc_t));
+ if (!shlib->funcarray) {
fprintf(stderr, "[LOADER] load_module_shlib(): unable to allocate memory\n");
ret = -1;
goto load_module_shlib_exit;
}
+ shlib->len_funcarray = numf;
+ shlib->numfunc = 0;
}
- loader_data.shlibs[lib_idx].numfunc = 0;
for (int i = 0; i < numf; i++) {
farray[i].fptr = dlsym(lib_handle,farray[i].fname);
if (!farray[i].fptr) {
@@ -215,9 +212,32 @@ int load_module_version_shlib(char *modname, char *version, loader_shlibfunc_t *
ret = -1;
goto load_module_shlib_exit;
}
- loader_data.shlibs[lib_idx].funcarray[i].fname=strdup(farray[i].fname);
- loader_data.shlibs[lib_idx].funcarray[i].fptr = farray[i].fptr;
- loader_data.shlibs[lib_idx].numfunc++;
+ /* check whether this function has been loaded before */
+ int j = 0;
+ for (; j < shlib->numfunc; ++j) {
+ if (shlib->funcarray[j].fptr == farray[i].fptr) {
+ int rc = strcmp(shlib->funcarray[i].fname, farray[i].fname);
+ AssertFatal(rc == 0,
+ "reloading the same fptr with different fnames (%s, %s)\n",
+ shlib->funcarray[i].fname, farray[i].fname);
+ break;
+ }
+ }
+ if (j == shlib->numfunc) {
+ if (shlib->numfunc == shlib->len_funcarray) {
+ loader_shlibfunc_t *n = realloc(shlib->funcarray, shlib->numfunc * 2 * sizeof(loader_shlibfunc_t));
+ if (!n) {
+ fprintf(stderr, "[LOADER] %s(): unable to allocate memory\n", __func__);
+ ret = -1;
+ goto load_module_shlib_exit;
+ }
+ shlib->funcarray = n;
+ shlib->len_funcarray = shlib->numfunc * 2;
+ }
+ shlib->funcarray[j].fname = strdup(farray[i].fname);
+ shlib->funcarray[j].fptr = farray[i].fptr;
+ shlib->numfunc++;
+ }
} /* for int i... */
} else { /* farray ! NULL */
sprintf(afname,"%s_getfarray",modname);
@@ -248,3 +268,18 @@ void * get_shlibmodule_fptr(char *modname, char *fname)
} /* for i loop on modules */
return NULL;
}
+
+void loader_reset()
+{
+ for (int i = 0; i < loader_data.numshlibs && loader_data.shlibs[i].name != NULL; i++) {
+ loader_shlibdesc_t *shlib = &loader_data.shlibs[i];
+ free(shlib->name);
+ free(shlib->thisshlib_path);
+ for (int j = 0; j < shlib->numfunc; ++j)
+ free(shlib->funcarray[j].fname);
+ free(shlib->funcarray);
+ shlib->numfunc = 0;
+ shlib->len_funcarray = 0;
+ }
+ free(loader_data.shlibs);
+}
diff --git a/common/utils/load_module_shlib.h b/common/utils/load_module_shlib.h
index 0e80a5353c7f39f87a3cf3bc820d23e71e01bceb..8139c21909616e9aede8765c66cb79a57713f265 100644
--- a/common/utils/load_module_shlib.h
+++ b/common/utils/load_module_shlib.h
@@ -47,6 +47,7 @@ typedef struct {
char *thisshlib_path;
uint32_t numfunc;
loader_shlibfunc_t *funcarray;
+ uint32_t len_funcarray;
}loader_shlibdesc_t;
typedef struct {
@@ -90,5 +91,6 @@ extern void * get_shlibmodule_fptr(char *modname, char *fname);
extern loader_data_t loader_data;
#endif /* LOAD_MODULE_SHLIB_MAIN */
#define load_module_shlib(M, F, N, I) load_module_version_shlib(M, NULL, F, N, I)
+void loader_reset();
#endif
diff --git a/common/utils/lte/ue_power.h b/common/utils/lte/ue_power.h
deleted file mode 100644
index caeebec2c8f01fabfb4362313e44649835f6a492..0000000000000000000000000000000000000000
--- a/common/utils/lte/ue_power.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file ue_power.h
-* \brief support routines used in MAC and PHY
-* \author R. Knopp, F. Kaltenberger
-* \date 2020
-* \version 0.1
-* \company Eurecom
-* \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr
-* \note
-* \warning
-*/
-
-int16_t estimate_ue_tx_power(int norm,uint32_t tbs, uint32_t nb_rb, uint8_t control_only, lte_prefix_type_t ncp, uint8_t use_srs);
-
diff --git a/common/utils/msc/msc.c b/common/utils/msc/msc.c
deleted file mode 100644
index 84b723b02286694f0837f7ac817c592e5e98f72c..0000000000000000000000000000000000000000
--- a/common/utils/msc/msc.c
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file msc.c
- * \brief Message chart generator logging utility (generated files to processed by a script to produce a mscgen input file for generating a sequence diagram document)
- * \author Lionel GAUTHIER
- * \date 2015
- * \email: lionel.gauthier@eurecom.fr
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <stdint.h>
-#include <inttypes.h>
-
-#define MSC_LIBRARY
-#include "msc.h"
-
-#include "liblfds611.h"
-#include "intertask_interface.h"
-
-
-
-#include "assertions.h"
-
-//-------------------------------
-#define MSC_MAX_QUEUE_ELEMENTS 1024
-#define MSC_MAX_PROTO_NAME_LENGTH 16
-#define MSC_MAX_MESSAGE_LENGTH 512
-
-//-------------------------------
-
-FILE *g_msc_fd;
-char g_msc_proto2str[MAX_MSC_PROTOS][MSC_MAX_PROTO_NAME_LENGTH];
-
-msc_interface_t msc_interface;
-
-typedef unsigned long msc_message_number_t;
-typedef struct msc_queue_item_s {
- char *message_str;
- uint32_t message_str_size;
- uint8_t *message_bin;
- uint32_t message_bin_size;
-} msc_queue_item_t;
-
-msc_message_number_t g_message_number = 0;
-struct lfds611_queue_state *g_msc_message_queue_p = NULL;
-struct lfds611_stack_state *g_msc_memory_stack_p = NULL;
-
-//------------------------------------------------------------------------------
-void *msc_task(void *args_p)
-//------------------------------------------------------------------------------
-{
- MessageDef *received_message_p = NULL;
- // const char *msg_name = NULL;
- // instance_t instance = 0;
- long timer_id;
- itti_mark_task_ready(TASK_MSC);
- msc_start_use();
- timer_setup(0, // seconds
- 50000, // usec
- TASK_MSC,
- INSTANCE_DEFAULT,
- TIMER_PERIODIC,
- NULL,
- &timer_id);
-
- while(1) {
- itti_receive_msg(TASK_MSC, &received_message_p);
-
- if (received_message_p != NULL) {
- // msg_name = ITTI_MSG_NAME (received_message_p);
- // instance = ITTI_MSG_DESTINATION_INSTANCE (received_message_p);
- switch (ITTI_MSG_ID(received_message_p)) {
- case TIMER_HAS_EXPIRED: {
- msc_flush_messages();
- }
- break;
-
- case TERMINATE_MESSAGE: {
- fprintf(stderr, " *** Exiting MSC thread\n");
- timer_remove(timer_id);
- msc_end();
- itti_exit_task();
- }
- break;
-
- case MESSAGE_TEST: {
- }
- break;
-
- default: {
- }
- break;
- }
- }
- }
-
- fprintf(stderr, "Task MSC exiting\n");
- return NULL;
-}
-
-//------------------------------------------------------------------------------
-int msc_init(const msc_env_t envP, const int max_threadsP)
-//------------------------------------------------------------------------------
-{
- int i;
- int rv;
- void *pointer_p;
- char msc_filename[256];
- fprintf(stderr, "Initializing MSC logs\n");
- rv = snprintf(msc_filename, 256, "/tmp/openair.msc.%i.log", envP); // TODO NAME
-
- if ((0 >= rv) || (256 < rv)) {
- fprintf(stderr, "Error in MSC log file name");
- }
-
- g_msc_fd = fopen(msc_filename,"w");
- AssertFatal(g_msc_fd != NULL, "Could not open MSC log file %s : %s", msc_filename, strerror(errno));
- rv = lfds611_stack_new(&g_msc_memory_stack_p, (lfds611_atom_t)max_threadsP + 2);
-
- if (0 >= rv) {
- AssertFatal (0, "lfds611_stack_new failed!\n");
- }
-
- rv = lfds611_queue_new(&g_msc_message_queue_p, (lfds611_atom_t)MSC_MAX_QUEUE_ELEMENTS);
- AssertFatal (rv, "lfds611_queue_new failed!\n");
- AssertFatal (g_msc_message_queue_p != NULL, "g_msc_message_queue_p is NULL!\n");
- msc_start_use();
-
- for (i=0; i < max_threadsP * 30; i++) {
- pointer_p = malloc(MSC_MAX_MESSAGE_LENGTH);
- AssertFatal (pointer_p, "malloc failed!\n");
- rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, pointer_p );
- AssertFatal (rv, "lfds611_stack_guaranteed_push failed for item %d\n", i);
- }
-
- for (i = MIN_MSC_PROTOS; i < MAX_MSC_PROTOS; i++) {
- switch (i) {
- case MSC_IP_UE:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "IP_UE");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_IP_ENB:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "IP_ENB");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if (envP == MSC_E_UTRAN_LIPA) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_NAS_UE:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "NAS_UE");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_RRC_UE:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "RRC_UE");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_PDCP_UE:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "PDCP_UE");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_RLC_UE:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "RLC_UE");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_MAC_UE:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "MAC_UE");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_PHY_UE:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "PHY_UE");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_PHY_ENB:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "PHY_ENB");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_MAC_ENB:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "MAC_ENB");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_RLC_ENB:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "RLC_ENB");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_PDCP_ENB:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "PDCP_ENB");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_RRC_ENB:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "RRC_ENB");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_S1AP_ENB:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "S1AP_ENB");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_MME_GW) || (envP == MSC_MME)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_GTPU_ENB:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "GTPU_ENB");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_GTPU_SGW:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "GTPU_SGW");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_MME_GW) || (envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_S1AP_MME:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "S1AP_MME");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_MME_GW) || (envP == MSC_MME) || (envP == MSC_E_UTRAN) || (envP == MSC_E_UTRAN_LIPA)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_MMEAPP_MME:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "MME_APP");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_MME_GW) || (envP == MSC_MME)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_NAS_MME:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "NAS_MME");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- msc_log_declare_proto(i);
- break;
-
- case MSC_NAS_EMM_MME:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "NAS_EMM");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_MME_GW) || (envP == MSC_MME)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_NAS_ESM_MME:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "NAS_ESM");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_MME_GW) || (envP == MSC_MME)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_SP_GWAPP_MME:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "SP_GW_MME");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if (envP == MSC_MME_GW) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_S11_MME:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "S11_MME");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if (envP == MSC_MME) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_S6A_MME:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "S6A");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_MME_GW) || (envP == MSC_MME)) {
- msc_log_declare_proto(i);
- }
-
- break;
-
- case MSC_HSS:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "HSS");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
-
- if ((envP == MSC_MME_GW) || (envP == MSC_MME)) {
- msc_log_declare_proto(i);
- }
-
- break;
- case MSC_F1AP_CU:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "F1AP_CU");
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
- //if ((envP == MSC_E_UTRAN) || (envP == MSC_MME_GW) || (envP == MSC_MME)) {
- msc_log_declare_proto(i);
- //}
- break;
- case MSC_F1AP_DU:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "F1AP_DU");
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
- //if ((envP == MSC_E_UTRAN) || (envP == MSC_MME_GW) || (envP == MSC_MME)) {
- msc_log_declare_proto(i);
- //}
- break;
- default:
- rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "UNKNOWN");
-
- if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {
- g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;
- }
- }
- }
-
- rv = itti_create_task (TASK_MSC, msc_task, NULL);
- AssertFatal (rv == 0, "Create task for MSC failed!\n");
- fprintf(stderr, "Initializing MSC logs Done\n");
- return 0;
-}
-
-//------------------------------------------------------------------------------
-void msc_start_use(void)
-//------------------------------------------------------------------------------
-{
- lfds611_queue_use(g_msc_message_queue_p);
- lfds611_stack_use(g_msc_memory_stack_p);
-}
-
-
-//------------------------------------------------------------------------------
-void msc_flush_messages(void)
-//------------------------------------------------------------------------------
-{
- int rv;
- msc_queue_item_t *item_p = NULL;
-
- while ((rv = lfds611_queue_dequeue( g_msc_message_queue_p, (void **)&item_p )) == 1) {
- if (NULL != item_p->message_str) {
- fputs(item_p->message_str, g_msc_fd);
- // TODO BIN DATA
- rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, item_p->message_str );
- }
-
- // TODO FREE BIN DATA
- free(item_p);
- }
-
- fflush(g_msc_fd);
-}
-
-
-//------------------------------------------------------------------------------
-void msc_end(void)
-//------------------------------------------------------------------------------
-{
- int rv;
-
- if (NULL != g_msc_fd ) {
- msc_flush_messages();
- rv = fflush(g_msc_fd);
-
- if (rv != 0) {
- fprintf(stderr, "Error while flushing stream of MSC log file: %s", strerror(errno));
- }
-
- rv = fclose(g_msc_fd);
-
- if (rv != 0) {
- fprintf(stderr, "Error while closing MSC log file: %s", strerror(errno));
- }
- }
-}
-
-//------------------------------------------------------------------------------
-void msc_log_declare_proto(
- const msc_proto_t protoP
-)
-//------------------------------------------------------------------------------
-{
- int rv = 0;
- msc_queue_item_t *new_item_p = NULL;
- char *char_message_p = NULL;
-
- if ((MIN_MSC_PROTOS <= protoP) && (MAX_MSC_PROTOS > protoP)) {
- // may be build a memory pool for that also ?
- new_item_p = malloc(sizeof(msc_queue_item_t));
-
- if (NULL != new_item_p) {
- rv = lfds611_stack_pop(g_msc_memory_stack_p, (void **)&char_message_p);
-
- if (0 == rv) {
- msc_flush_messages();
- rv = lfds611_stack_pop(g_msc_memory_stack_p, (void **)&char_message_p);
- }
-
- if (1 == rv) {
- rv = snprintf(char_message_p, MSC_MAX_MESSAGE_LENGTH, "%"PRIu64" [PROTO] %d %s\n", __sync_fetch_and_add (&g_message_number, 1), protoP, &g_msc_proto2str[protoP][0]);
-
- if (0 > rv) {
- fprintf(stderr, "Error while declaring new protocol in MSC: %s", strerror(errno));
- }
-
- new_item_p->message_str = char_message_p;
- new_item_p->message_str_size = rv;
- new_item_p->message_bin = NULL;
- new_item_p->message_bin_size = 0;
- rv = lfds611_queue_enqueue( g_msc_message_queue_p, new_item_p );
-
- if (0 == rv) {
- rv = lfds611_queue_guaranteed_enqueue(g_msc_message_queue_p, new_item_p );
-
- if (0 == rv) {
- fprintf(stderr, "Error while lfds611_queue_guaranteed_enqueue message %s in MSC", char_message_p);
- rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
- free(new_item_p);
- }
- }
-
- return;
- } else {
- fprintf(stderr, "Error while lfds611_stack_pop()\n");
- }
-
- free(new_item_p);
- } else {
- fprintf(stderr, "Error while malloc in MSC");
- }
- }
-}
-//------------------------------------------------------------------------------
-void msc_log_event(
- const msc_proto_t protoP,
- char *format, ...)
-//------------------------------------------------------------------------------
-{
- va_list args;
- int rv;
- int rv2;
- msc_queue_item_t *new_item_p = NULL;
- char *char_message_p = NULL;
-
- if ((MIN_MSC_PROTOS > protoP) || (MAX_MSC_PROTOS <= protoP)) {
- return;
- }
-
- new_item_p = malloc(sizeof(msc_queue_item_t));
-
- if (NULL != new_item_p) {
- rv = lfds611_stack_pop(g_msc_memory_stack_p, (void **)&char_message_p);
-
- if (0 == rv) {
- msc_flush_messages();
- rv = lfds611_stack_pop(g_msc_memory_stack_p, (void **)&char_message_p);
- }
-
- if (1 == rv) {
- rv = snprintf(char_message_p, MSC_MAX_MESSAGE_LENGTH, "%"PRIu64" [EVENT] %d ", __sync_fetch_and_add (&g_message_number, 1), protoP);
-
- if ((0 > rv) || (MSC_MAX_MESSAGE_LENGTH < rv)) {
- fprintf(stderr, "Error while logging MSC event : %s", &g_msc_proto2str[protoP][0]);
- goto error_event;
- }
-
- va_start(args, format);
- rv2 = vsnprintf(&char_message_p[rv],MSC_MAX_MESSAGE_LENGTH - rv, format, args);
- va_end(args);
-
- if ((0 > rv2) || ((MSC_MAX_MESSAGE_LENGTH - rv) < rv2)) {
- fprintf(stderr, "Error while logging MSC event : %s", &g_msc_proto2str[protoP][0]);
- goto error_event;
- }
-
- rv += rv2;
- rv2 = snprintf(&char_message_p[rv],MSC_MAX_MESSAGE_LENGTH - rv, "\n");
-
- if ((0 > rv2) || ((MSC_MAX_MESSAGE_LENGTH - rv) < rv2)) {
- fprintf(stderr, "Error while logging MSC event : %s", &g_msc_proto2str[protoP][0]);
- goto error_event;
- }
-
- rv += rv2;
- new_item_p->message_str = char_message_p;
- new_item_p->message_str_size = rv;
- new_item_p->message_bin = NULL;
- new_item_p->message_bin_size = 0;
- rv = lfds611_queue_enqueue( g_msc_message_queue_p, new_item_p );
-
- if (0 == rv) {
- fprintf(stderr, "Error while lfds611_queue_guaranteed_enqueue message %s in MSC", char_message_p);
- rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
- free(new_item_p);
- }
- } else {
- fprintf(stderr, "Error while lfds611_stack_pop()\n");
- }
- }
-
- return;
-error_event:
- rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
- free(new_item_p);
-}
-//------------------------------------------------------------------------------
-void msc_log_message(
- const char *const message_operationP,
- const msc_proto_t proto1P,
- const msc_proto_t proto2P,
- const uint8_t *const bytesP,
- const unsigned int num_bytes,
- char *format, ...)
-//------------------------------------------------------------------------------
-{
- va_list args;
- uint64_t mac = 0; // TO DO mac on bytesP param
- int rv;
- int rv2;
- msc_queue_item_t *new_item_p = NULL;
- char *char_message_p = NULL;
-
- if ((MIN_MSC_PROTOS > proto1P) || (MAX_MSC_PROTOS <= proto1P) ||
- (MIN_MSC_PROTOS > proto2P) || (MAX_MSC_PROTOS <= proto2P) ) {
- return;
- }
-
- new_item_p = malloc(sizeof(msc_queue_item_t));
-
- if (NULL != new_item_p) {
- rv = lfds611_stack_pop(g_msc_memory_stack_p, (void **)&char_message_p);
-
- if (0 == rv) {
- msc_flush_messages();
- rv = lfds611_stack_pop(g_msc_memory_stack_p, (void **)&char_message_p);
- }
-
- if (1 == rv) {
- rv = snprintf(char_message_p, MSC_MAX_MESSAGE_LENGTH, "%"PRIu64" [MESSAGE] %d %s %d %"PRIu64" ",
- __sync_fetch_and_add (&g_message_number, 1), proto1P, message_operationP, proto2P, mac);
-
- if ((0 > rv) || (MSC_MAX_MESSAGE_LENGTH < rv)) {
- fprintf(stderr, "Error while logging MSC message : %s/%s", &g_msc_proto2str[proto1P][0], &g_msc_proto2str[proto2P][0]);
- goto error_event;
- }
-
- va_start(args, format);
- rv2 = vsnprintf(&char_message_p[rv],MSC_MAX_MESSAGE_LENGTH - rv, format, args);
- va_end(args);
-
- if ((0 > rv2) || ((MSC_MAX_MESSAGE_LENGTH - rv) < rv2)) {
- fprintf(stderr, "Error while logging MSC message : %s/%s", &g_msc_proto2str[proto1P][0], &g_msc_proto2str[proto2P][0]);
- goto error_event;
- }
-
- rv += rv2;
- rv2 = snprintf(&char_message_p[rv],MSC_MAX_MESSAGE_LENGTH - rv, "\n");
-
- if ((0 > rv2) || ((MSC_MAX_MESSAGE_LENGTH - rv) < rv2)) {
- fprintf(stderr, "Error while logging MSC message : %s/%s", &g_msc_proto2str[proto1P][0], &g_msc_proto2str[proto2P][0]);
- goto error_event;
- }
-
- rv += rv2;
- new_item_p->message_str = char_message_p;
- new_item_p->message_str_size = rv;
- new_item_p->message_bin = NULL; // TO DO
- new_item_p->message_bin_size = 0; // TO DO
- rv = lfds611_queue_enqueue( g_msc_message_queue_p, new_item_p );
-
- if (0 == rv) {
- fprintf(stderr, "Error while lfds611_queue_guaranteed_enqueue message %s in MSC", char_message_p);
- rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
- free(new_item_p);
- }
- } else {
- fprintf(stderr, "Error while lfds611_stack_pop()\n");
- msc_flush_messages();
- }
- }
-
- return;
-error_event:
- rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, char_message_p );
- free(new_item_p);
-}
-
-//------------------------------------------------------------------------------
-// function called when oai loader loads the msc shared lib
-int msc_autoinit(msc_interface_t *msc_interface)
-//------------------------------------------------------------------------------
-{
- msc_interface->msc_init = msc_init;
- msc_interface->msc_start_use = msc_start_use;
- msc_interface->msc_end = msc_end;
- msc_interface->msc_log_event = msc_log_event;
- msc_interface->msc_log_message = msc_log_message;
- msc_interface->msc_loaded = 1;
- return 0;
-}
diff --git a/common/utils/msc/msc.h b/common/utils/msc/msc.h
deleted file mode 100644
index adb0d9e657e5ef7a54ad433938d9c372ef225ec3..0000000000000000000000000000000000000000
--- a/common/utils/msc/msc.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-#ifndef MSC_H_
-#define MSC_H_
-#include <stdarg.h>
-#include <stdint.h>
-
-typedef enum {
- MIN_MSC_ENV = 0,
- MSC_E_UTRAN = MIN_MSC_ENV,
- MSC_E_UTRAN_LIPA,
- MSC_MME_GW,
- MSC_MME,
- MSC_SP_GW,
- MAX_MSC_ENV
-} msc_env_t;
-
-
-typedef enum {
- MIN_MSC_PROTOS = 0,
- MSC_IP_UE = MIN_MSC_PROTOS,
- MSC_NAS_UE,
- MSC_RRC_UE,
- MSC_PDCP_UE,
- MSC_RLC_UE,
- MSC_MAC_UE,
- MSC_PHY_UE,
- MSC_PHY_ENB,
- MSC_MAC_ENB,
- MSC_RLC_ENB,
- MSC_PDCP_ENB,
- MSC_PDCP_GNB,
- MSC_RRC_ENB,
- MSC_RRC_GNB,
- MSC_IP_ENB,
- MSC_S1AP_ENB,
- MSC_NGAP_GNB,
- MSC_GTPU_ENB,
- MSC_GTPU_GNB,
- MSC_GTPU_SGW,
- MSC_S1AP_MME,
- MSC_NGAP_AMF,
- MSC_MMEAPP_MME,
- MSC_NAS_MME,
- MSC_NAS_EMM_MME,
- MSC_NAS_ESM_MME,
- MSC_SP_GWAPP_MME,
- MSC_S11_MME,
- MSC_S6A_MME,
- MSC_HSS,
- MSC_F1AP_CU,
- MSC_F1AP_DU,
- MSC_X2AP_SRC_ENB,
- MSC_X2AP_TARGET_ENB,
- MAX_MSC_PROTOS,
-} msc_proto_t;
-
-
-
-// Access stratum
-#define MSC_AS_TIME_FMT "%05u:%02u"
-
-#define MSC_AS_TIME_ARGS(CTXT_Pp) \
- (CTXT_Pp)->frame, \
- (CTXT_Pp)->subframe
-
-typedef int(*msc_init_t)(const msc_env_t, const int );
-typedef void(*msc_start_use_t)(void );
-typedef void(*msc_end_t)(void);
-typedef void(*msc_log_event_t)(const msc_proto_t,char *, ...);
-typedef void(*msc_log_message_t)(const char *const, const msc_proto_t, const msc_proto_t,
- const uint8_t *const, const unsigned int, char *, ...);
-typedef struct msc_interface {
- int msc_loaded;
- msc_init_t msc_init;
- msc_start_use_t msc_start_use;
- msc_end_t msc_end;
- msc_log_event_t msc_log_event;
- msc_log_message_t msc_log_message;
-} msc_interface_t;
-
-#ifdef MSC_LIBRARY
-int msc_init(const msc_env_t envP, const int max_threadsP);
-void msc_start_use(void);
-void msc_flush_messages(void);
-void msc_end(void);
-void msc_log_declare_proto(const msc_proto_t protoP);
-void msc_log_event(const msc_proto_t protoP,char *format, ...);
-void msc_log_message(
- const char *const message_operationP,
- const msc_proto_t receiverP,
- const msc_proto_t senderP,
- const uint8_t *const bytesP,
- const unsigned int num_bytes,
- char *format, ...);
-
-#else
-
-#define MESSAGE_CHART_GENERATOR msc_interface.msc_loaded
-
-extern msc_interface_t msc_interface;
-#define MSC_INIT(arg1,arg2) if(msc_interface.msc_loaded) msc_interface.msc_init(arg1,arg2)
-#define MSC_START_USE if(msc_interface.msc_loaded) msc_interface.msc_start_use
-#define MSC_END if(msc_interface.msc_loaded) msc_interface.msc_end
-#define MSC_LOG_EVENT(mScPaRaMs, fORMAT, aRGS...) if(msc_interface.msc_loaded) msc_interface.msc_log_event(mScPaRaMs, fORMAT, ##aRGS)
-#define MSC_LOG_RX_MESSAGE(rECEIVER, sENDER, bYTES, nUMbYTES, fORMAT, aRGS...) if(msc_interface.msc_loaded) msc_interface.msc_log_message("<-",rECEIVER, sENDER, (const uint8_t *)bYTES, nUMbYTES, fORMAT, ##aRGS)
-#define MSC_LOG_RX_DISCARDED_MESSAGE(rECEIVER, sENDER, bYTES, nUMbYTES, fORMAT, aRGS...) if(msc_interface.msc_loaded) msc_interface.msc_log_message("x-",rECEIVER, sENDER, (const uint8_t *)bYTES, nUMbYTES, fORMAT, ##aRGS)
-#define MSC_LOG_TX_MESSAGE(sENDER, rECEIVER, bYTES, nUMbYTES, fORMAT, aRGS...) if(msc_interface.msc_loaded) msc_interface.msc_log_message("->",sENDER, rECEIVER, (const uint8_t *)bYTES, nUMbYTES, fORMAT, ##aRGS)
-#define MSC_LOG_TX_MESSAGE_FAILED(sENDER, rECEIVER, bYTES, nUMbYTES, fORMAT, aRGS...) if(msc_interface.msc_loaded) msc_interface.msc_log_message("-x",sENDER, rECEIVER, (const uint8_t *)bYTES, nUMbYTES, fORMAT, ##aRGS)
-#endif
-
-#endif
diff --git a/common/utils/ocp_itti/intertask_interface.h b/common/utils/ocp_itti/intertask_interface.h
index 3188e5889f0d2b43d47c4a1b0e67c620e7a09c18..e595311b26cc90720653e39318127cd45c757ba0 100644
--- a/common/utils/ocp_itti/intertask_interface.h
+++ b/common/utils/ocp_itti/intertask_interface.h
@@ -256,8 +256,8 @@ typedef struct IttiMsgText_s {
#include <openair3/MME_APP/mme_app.h>
//#include <proto.h>
-#include <openair3/GTPV1-U/gtpv1u_eNB_task.h>
-#include <openair3/GTPV1-U/gtpv1u_gNB_task.h>
+#include <openair3/ocp-gtpu/gtpv1u_eNB_task.h>
+#include <openair3/ocp-gtpu/gtpv1u_gNB_task.h>
void *rrc_enb_process_itti_msg(void *);
#include <openair3/SCTP/sctp_eNB_task.h>
#include <openair3/NGAP/ngap_gNB.h>
@@ -338,10 +338,7 @@ void *rrc_enb_process_msg(void *);
TASK_DEF(TASK_RRC_NRUE, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_NAS_UE, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_RAL_UE, TASK_PRIORITY_MED, 200, NULL, NULL) \
- TASK_DEF(TASK_MSC, TASK_PRIORITY_MED, 200, NULL, NULL)\
TASK_DEF(TASK_GTPV1_U, TASK_PRIORITY_MED, 1000,NULL, NULL)\
- TASK_DEF(OCP_GTPV1_U, TASK_PRIORITY_MED, 1000,NULL, NULL)\
- TASK_DEF(TASK_UDP, TASK_PRIORITY_MED, 1000, NULL, NULL)\
TASK_DEF(TASK_CU_F1, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_DU_F1, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_RRC_UE_SIM, TASK_PRIORITY_MED, 200, NULL, NULL) \
@@ -560,7 +557,6 @@ MessageDef *itti_alloc_new_message_sized(
This function should be called from the main thread after having created all ITTI tasks.
**/
void itti_wait_tasks_end(void);
-#define ADDED_QUEUES_MAX 10 // Fix me: MSC component too hard to understand, we keep room for 10 queues created dynamically
void itti_set_task_real_time(task_id_t task_id);
/** \brief Send a termination message to all tasks.
diff --git a/common/utils/telnetsrv/DOC/telnetlog.md b/common/utils/telnetsrv/DOC/telnetlog.md
index 36c5cfb3486d5ff79efebb8921860ed4f185d1a3..cb008fc8bb5b47a7537f2b744938c96e69942acf 100644
--- a/common/utils/telnetsrv/DOC/telnetlog.md
+++ b/common/utils/telnetsrv/DOC/telnetlog.md
@@ -62,7 +62,6 @@ component verbosity level enabled
16 PERF: medium info N
17 OIP: medium info N
18 CLI: medium info N
-19 MSC: medium info N
20 OCM: medium info N
21 UDP: medium info N
22 GTPV1U: medium info N
diff --git a/configuration/bladeRF/enb-band7-5mhz.conf b/configuration/bladeRF/enb-band7-5mhz.conf
index 9d192075223ebd1ad1a6d525ec39e167946e18b6..985f4eb378cbaa17fe5b026b5630cb4c38c85e08 100644
--- a/configuration/bladeRF/enb-band7-5mhz.conf
+++ b/configuration/bladeRF/enb-band7-5mhz.conf
@@ -206,19 +206,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="high";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="debug";
- rlc_log_verbosity ="high";
pdcp_log_level ="info";
- pdcp_log_verbosity ="high";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
@@ -267,17 +260,10 @@ RUs = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="high";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="high";
pdcp_log_level ="info";
- pdcp_log_verbosity ="high";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/doc/RUNMODEM.md b/doc/RUNMODEM.md
index 89d2ec8a2de34ca4bc4214ba58de4ffb8b3a241a..449859b04225039b846ca02acc8199a01fc67f28 100644
--- a/doc/RUNMODEM.md
+++ b/doc/RUNMODEM.md
@@ -155,6 +155,14 @@ At the UE the --sa flag will:
4) 5G-NR RRC Reconfiguration
5) Start Downlink and Uplink Data Transfer
+Command line parameters for UE in --sa mode:
+- `C` : downlink carrier frequency in Hz (default value 0)
+- `CO` : uplink frequency offset for FDD in Hz (default value 0)
+- `numerology` : numerology index (default value 1)
+- `r` : bandwidth in terms of RBs (default value 106)
+- `band` : NR band number (default value 78)
+- `s` : SSB start subcarrier (default value 512)
+
### Run OAI in SA mode
From the `cmake_targets/ran_build/build` folder:
@@ -179,21 +187,15 @@ Additionally, at UE side `--uecap_file` option can be used to pass the UE Capabi
## IF setup with OAI
-The -C and --CO flags can be used together at UE side to set custom downlink and uplink FR1 arbitrary frequencies for the IF equipment.
-
-In order to run this setup, the following flags are needed at the UE side:
-
-`-C`
-
-`--CO`
-
-and the following parameters must be configured in the RUs section of the gNB configuration file:
-
-`if_freq`
+OAI is also compatible with Intermediate Frequency (IF) equipment. This allows to use RF front-end that with arbitrary frequencies bands that do not comply with the standardised 3GPP NR bands.
-`if_offset`
+To configure the IF frequencies it is necessary to use two command-line options at UE side:
+- `if_freq`, downlink frequency in Hz
+- `if_freq_off`, uplink frequency offset in Hz
-The values must be given in Hz.
+Accordingly, the following parameters must be configured in the RUs section of the gNB configuration file:
+- `if_freq`
+- `if_offset`
### Run OAI with custom DL/UL arbitrary frequencies
@@ -207,7 +209,7 @@ gNB on machine 1:
UE on machine 2:
-`sudo ./nr-uesoftmodem -C 2169080000 --CO -400000000`
+`sudo ./nr-uesoftmodem --if_freq 2169080000 --if_freq_off -400000000`
diff --git a/doc/SW_archi.md b/doc/SW_archi.md
index 0e77cfa580afa5647df6173fc9458adef0f23f20..7648fb2e167ece0f133013e7339685b8de6674d8 100644
--- a/doc/SW_archi.md
+++ b/doc/SW_archi.md
@@ -369,7 +369,7 @@ gtpv1u_create_s1u_tunnel(), delete tunnel, ... functions are called inside the o
# New GTP
## initialization
-ocp_gtpv1uTask(): this creates only the thread, doesn't configure anything
+gtpv1uTask(): this creates only the thread, doesn't configure anything
gtpv1Init(): creates a listening socket to Linux for a given reception and select a local IP address
## newGtpuCreateTunnel()
diff --git a/doc/TESTING_5GSA_setup.md b/doc/TESTING_5GSA_setup.md
index 048d8c86ff2e7a212693f3c1a65becef2bfa962f..f8c85bf2ca51f012ed578fd99cf145d12f6b649c 100644
--- a/doc/TESTING_5GSA_setup.md
+++ b/doc/TESTING_5GSA_setup.md
@@ -169,8 +169,7 @@ MACRLCs = (
At the point of writing this document the control-plane exchanges between the CU and the DU over *F1-C* interface, as well as some IP traffic tests over *F1-U* have been validated using the OAI gNB/nrUE in RFSIMULATOR mode.
-
-*These extensions are not yet fully integrated into develop branch, as they are under merge request. Until they get fully integrated, the CU/DU functionalities can be tested in [NR_F1C_F1U_extensions](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tree/NR_F1C_F1U_extensions) branch.*
+
## 1.2 OAI 5G Core Network installation and configuration
The instructions for the installation of OAI CN components (AMF, SMF, NRF, UPF) using `docker-compose` can be found [here](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/blob/master/README.md).
@@ -264,12 +263,12 @@ the gNB can be launched in 2 modes:
1. Launch the CU component:
```bash
sudo RFSIMULATOR=server ./nr-softmodem --rfsim --sa \
- -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
+ -O ../../../ci-scripts/conf_files/gNB_SA_CU.conf
```
2. Launch the DU component:
```bash
sudo RFSIMULATOR=server ./nr-softmodem --rfsim --sa \
- -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
+ -O ../../../ci-scripts/conf_files/gNB_SA_DU.conf
```
- To launch the OAI UE (valid in `monolithic` gNB and `CU/DU split` gNB):
diff --git a/doc/testing_gnb_w_cots_ue_resources/enb.conf b/doc/testing_gnb_w_cots_ue_resources/enb.conf
index a6bbd98bda359b47c0d817d52245d8588b09565a..027b6f2499e21d1031dc6f318c798bc8219b4b12 100755
--- a/doc/testing_gnb_w_cots_ue_resources/enb.conf
+++ b/doc/testing_gnb_w_cots_ue_resources/enb.conf
@@ -206,19 +206,12 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="high";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="debug";
- rlc_log_verbosity ="high";
pdcp_log_level ="info";
- pdcp_log_verbosity ="high";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
@@ -267,17 +260,10 @@ RUs = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="high";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="high";
pdcp_log_level ="info";
- pdcp_log_verbosity ="high";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/doc/testing_gnb_w_cots_ue_resources/gnb.conf b/doc/testing_gnb_w_cots_ue_resources/gnb.conf
index aae22a92bac58dce87a8ddf94324f04469555243..c96d2074456e2db36880f9faadb10468d1d33dfd 100755
--- a/doc/testing_gnb_w_cots_ue_resources/gnb.conf
+++ b/doc/testing_gnb_w_cots_ue_resources/gnb.conf
@@ -258,18 +258,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/doc/testing_gnb_w_cots_ue_resources/oai_enb.log b/doc/testing_gnb_w_cots_ue_resources/oai_enb.log
index 9b9de24a86e8e29de56ba06007d1cdfc0c833843..7356c0c88d776f95eeb581fef47eaca6caa7d1bc 100755
--- a/doc/testing_gnb_w_cots_ue_resources/oai_enb.log
+++ b/doc/testing_gnb_w_cots_ue_resources/oai_enb.log
@@ -62,7 +62,6 @@ ITTI init, useMME: 1
[0m[0m[TMR] Starting itti queue: TASK_RRC_UE as task 31
[0m[0m[TMR] Starting itti queue: TASK_NAS_UE as task 32
[0m[0m[TMR] Starting itti queue: TASK_RAL_UE as task 33
-[0m[0m[TMR] Starting itti queue: TASK_MSC as task 34
[0m[0m[TMR] Starting itti queue: TASK_GTPV1_U as task 35
[0m[0m[TMR] Starting itti queue: TASK_UDP as task 36
[0m[0m[TMR] Starting itti queue: TASK_CU_F1 as task 37
diff --git a/doc/testing_gnb_w_cots_ue_resources/oai_gnb.log b/doc/testing_gnb_w_cots_ue_resources/oai_gnb.log
index 37b3c105165a1638f2faca61ad17cda578ce3a36..3c76c0d0d68b4a3b74ba5aafce17c4687aa4ac82 100755
--- a/doc/testing_gnb_w_cots_ue_resources/oai_gnb.log
+++ b/doc/testing_gnb_w_cots_ue_resources/oai_gnb.log
@@ -58,7 +58,6 @@ CPU Freq is 3.092986
[0m[0m[TMR] Starting itti queue: TASK_RRC_UE as task 31
[0m[0m[TMR] Starting itti queue: TASK_NAS_UE as task 32
[0m[0m[TMR] Starting itti queue: TASK_RAL_UE as task 33
-[0m[0m[TMR] Starting itti queue: TASK_MSC as task 34
[0m[0m[TMR] Starting itti queue: TASK_GTPV1_U as task 35
[0m[0m[TMR] Starting itti queue: TASK_UDP as task 36
[0m[0m[TMR] Starting itti queue: TASK_CU_F1 as task 37
diff --git a/docker/Dockerfile.phySim.rhel8.2 b/docker/Dockerfile.phySim.rhel8.2
index 9f4b27ec0e4255a4b2bb4938fd67359e561a4e6f..2627a9eafdf503e6e1abbcf346e7ea60ce0a7c49 100644
--- a/docker/Dockerfile.phySim.rhel8.2
+++ b/docker/Dockerfile.phySim.rhel8.2
@@ -31,11 +31,14 @@ RUN rm -Rf /oai-ran
WORKDIR /oai-ran
COPY . .
+#only install address sanitizer for this container, the others don't need it
+RUN yum install -y libasan
+
#run build_oai to build the target image
RUN /bin/sh oaienv && \
cd cmake_targets && \
mkdir -p log && \
- ./build_oai --phy_simulators --ninja --verbose-ci
+ ./build_oai --phy_simulators --ninja --verbose-ci --sanitize-address
#start from scratch for target executable
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-physim
@@ -85,6 +88,7 @@ COPY --from=phy-sim-build \
/lib64/liblapack.so.3 \
/lib64/libexslt.so.0 \
/lib64/libxslt.so.1 \
+ /usr/lib64/libasan.so.5 \
/oai-ran/cmake_targets/ran_build/build/libdfts.so \
/oai-ran/cmake_targets/ran_build/build/libSIMU.so \
/oai-ran/cmake_targets/ran_build/build/libldpc.so \
diff --git a/docker/scripts/generateTemplate.py b/docker/scripts/generateTemplate.py
index 3d037294e6b479a6030e7ae921a71a8e4331817a..297c202a03d497287345922bf5835eabc2cae176 100644
--- a/docker/scripts/generateTemplate.py
+++ b/docker/scripts/generateTemplate.py
@@ -55,6 +55,7 @@ def main():
"rcc.band40.tm1.25PRB": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}',
"gnb.band78.tm1.fr1.106PRB.usrpb210.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}',
"gnb.band78.sa.fr1.106PRB.usrpn310.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}',
+ "gnb.sa.band66.fr1.106PRB.usrpn300.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}',
"gNB_SA_CU.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}',
"gNB_SA_DU.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}',
"ue.nfapi": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}',
diff --git a/docker/scripts/gnb_entrypoint.sh b/docker/scripts/gnb_entrypoint.sh
index 79d6c6dc372e62f172b97a06934d411d66b8623e..aec5c4805052187d8d31095aaaac223809043e56 100755
--- a/docker/scripts/gnb_entrypoint.sh
+++ b/docker/scripts/gnb_entrypoint.sh
@@ -10,6 +10,7 @@ THREAD_PARALLEL_CONFIG=${THREAD_PARALLEL_CONFIG:-PARALLEL_SINGLE_THREAD}
if [[ -v USE_NSA_TDD_MONO ]]; then cp $PREFIX/etc/gnb.nsa.tdd.conf $PREFIX/etc/gnb.conf; fi
if [[ -v USE_SA_TDD_MONO ]]; then cp $PREFIX/etc/gnb.sa.tdd.conf $PREFIX/etc/gnb.conf; fi
+if [[ -v USE_SA_FDD_MONO ]]; then cp $PREFIX/etc/gnb.sa.fdd.conf $PREFIX/etc/gnb.conf; fi
if [[ -v USE_SA_CU ]]; then ln -s $PREFIX/etc/gnb.sa.cu.conf $PREFIX/etc/gnb.conf; fi
if [[ -v USE_SA_TDD_CU ]]; then cp $PREFIX/etc/gnb.sa.du.tdd.conf $PREFIX/etc/gnb.conf; fi
# Sometimes, the templates are not enough. We mount a conf file on $PREFIX/etc. It can be a template itself.
diff --git a/docker/scripts/gnb_parameters.yaml b/docker/scripts/gnb_parameters.yaml
index 2f150d394a04697108d04804bfda617ddec6f628..8547d48e676af3629f4c659ea27db75dc259d059 100644
--- a/docker/scripts/gnb_parameters.yaml
+++ b/docker/scripts/gnb_parameters.yaml
@@ -94,6 +94,36 @@
- key: parallel_config
env: "@THREAD_PARALLEL_CONFIG@"
+ - filePrefix: gnb.sa.band66.fr1.106PRB.usrpn300.conf
+ outputfilename: "gnb.sa.fdd.conf"
+ config:
+ - key: Active_gNBs
+ env: "@GNB_NAME@"
+ - key: gNB_name
+ env: "@GNB_NAME@"
+ - key: mcc
+ env: "@MCC@"
+ - key: mnc
+ env: "@MNC@"
+ - key: mnc_length
+ env: "@MNC_LENGTH@"
+ - key: tracking_area_code
+ env: "@TAC@"
+ - key: sst
+ env: "@NSSAI_SST@"
+ - key: ipv4
+ env: "@AMF_IP_ADDRESS@"
+ - key: GNB_INTERFACE_NAME_FOR_NG_AMF
+ env: "@GNB_NGA_IF_NAME@"
+ - key: GNB_IPV4_ADDRESS_FOR_NG_AMF
+ env: "@GNB_NGA_IP_ADDRESS@"
+ - key: GNB_INTERFACE_NAME_FOR_NGU
+ env: "@GNB_NGU_IF_NAME@"
+ - key: GNB_IPV4_ADDRESS_FOR_NGU
+ env: "@GNB_NGU_IP_ADDRESS@"
+ - key: parallel_config
+ env: "@THREAD_PARALLEL_CONFIG@"
+
- filePrefix: gNB_SA_CU.conf
outputfilename: "gnb.sa.cu.conf"
config:
diff --git a/executables/nr-softmodem-common.h b/executables/nr-softmodem-common.h
index 45d7852adc134fb6de30b5b60d598563ff90097d..47fd816db5a95f4ac5cd642f109f1af8904c8c5b 100644
--- a/executables/nr-softmodem-common.h
+++ b/executables/nr-softmodem-common.h
@@ -104,7 +104,6 @@
#define CONFIG_HLP_LOGL "Set the global log level, valid options: (4:trace, 3:debug, 2:info, 1:warn, (0:error))\n"
#define CONFIG_HLP_LOGV "Set the global log verbosity \n"
#define CONFIG_HLP_TELN "Start embedded telnet server \n"
-#define CONFIG_HLP_MSC "Enable the MSC tracing utility \n"
#define CONFIG_HLP_SNR "Set average SNR in dB (for --siml1 option)\n"
#define CONFIG_HLP_NOS1 "Disable s1 interface\n"
#define CONFIG_HLP_NOKRNMOD "(noS1 only): Use tun instead of namesh module \n"
@@ -112,13 +111,11 @@
/* command line parameters for LOG utility */
/* optname helpstr paramflags XXXptr defXXXval type numelt */
/*--------------------------------------------------------------------------------------------------------------------------------*/
-#define START_MSC softmodem_params.start_msc
#define CMDLINE_LOGPARAMS_DESC_NR { \
{"R" , CONFIG_HLP_FLOG, 0, uptr:&online_log_messages, defintval:1, TYPE_INT, 0}, \
{"g" , CONFIG_HLP_LOGL, 0, uptr:&glog_level, defintval:0, TYPE_UINT, 0}, \
{"G" , CONFIG_HLP_LOGV, 0, uptr:&glog_verbosity, defintval:0, TYPE_UINT16, 0}, \
{"telnetsrv", CONFIG_HLP_TELN, PARAMFLAG_BOOL, uptr:&start_telnetsrv, defintval:0, TYPE_UINT, 0}, \
- {"msc", CONFIG_HLP_MSC, PARAMFLAG_BOOL, uptr:&START_MSC, defintval:0, TYPE_UINT, 0}, \
}
#define CMDLINE_ONLINELOG_IDX 0
diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index dc7b8bf8e337c4b9fbe6c8b8f5ada6a4ef6b9813..d9b06a45e4d1b3fbe0dd10623828b415c3e2ea5d 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -29,8 +29,6 @@
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
#include <common/utils/assertions.h>
-#include "msc.h"
-
#include "PHY/types.h"
#include "common/ran_context.h"
@@ -365,7 +363,7 @@ int create_gNB_tasks(uint32_t gnb_nb) {
//Use check on x2ap to consider the NSA scenario and check on AMF_MODE_ENABLED for the SA scenario
if(is_x2ap_enabled() || AMF_MODE_ENABLED) {
- if (itti_create_task (TASK_GTPV1_U, &nr_gtpv1u_gNB_task, NULL) < 0) {
+ if (itti_create_task (TASK_GTPV1_U, >pv1uTask, NULL) < 0) {
LOG_E(GTPU, "Create task for GTPV1U failed\n");
return -1;
}
@@ -589,48 +587,21 @@ static void wait_nfapi_init(char *thread_name) {
}
void init_pdcp(void) {
+ uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ?
+ PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT:
+ LINK_ENB_PDCP_TO_GTPV1U_BIT;
+
if (!get_softmodem_params()->nsa) {
if (!NODE_IS_DU(RC.nrrrc[0]->node_type)) {
- //pdcp_layer_init();
- uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ?
- (PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT;
-
- if (IS_SOFTMODEM_NOS1) {
- printf("IS_SOFTMODEM_NOS1 option enabled \n");
- pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT;
- }
-
+ pdcp_layer_init();
nr_pdcp_module_init(pdcp_initmask, 0);
-
- if (NODE_IS_CU(RC.nrrrc[0]->node_type)) {
- LOG_I(PDCP, "node is CU, pdcp send rlc_data_req by proto_agent \n");
- pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t)proto_agent_send_rlc_data_req);
- } else {
- LOG_I(PDCP, "node is gNB \n");
- pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t) rlc_data_req);
- pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) pdcp_data_ind);
- }
- } else {
- LOG_I(PDCP, "node is DU, rlc send pdcp_data_ind by proto_agent \n");
- pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) proto_agent_send_pdcp_data_ind);
}
} else {
pdcp_layer_init();
- uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ?
- (PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT;
-
- if (IS_SOFTMODEM_NOS1) {
- printf("IS_SOFTMODEM_NOS1 option enabled \n");
- pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT;
- }
-
nr_pdcp_module_init(pdcp_initmask, 0);
- pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t) rlc_data_req);
- pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) pdcp_data_ind);
}
}
-
int main( int argc, char **argv ) {
int ru_id, CC_id = 0;
start_background_system();
@@ -684,7 +655,6 @@ int main( int argc, char **argv ) {
cpuf=get_cpu_freq_GHz();
itti_init(TASK_MAX, tasks_info);
// initialize mscgen log after ITTI
- MSC_INIT(MSC_E_UTRAN, ADDED_QUEUES_MAX+TASK_MAX);
init_opt();
if(PDCP_USE_NETLINK && !IS_SOFTMODEM_NOS1) {
netlink_init();
diff --git a/executables/nr-softmodem.h b/executables/nr-softmodem.h
index 4190a6074bde182afcacec428a31dc4a84f57471..834e89b40390f242af8cb3936d79888a52667f2d 100644
--- a/executables/nr-softmodem.h
+++ b/executables/nr-softmodem.h
@@ -5,7 +5,6 @@
#include "flexran_agent.h"
#include "PHY/defs_gNB.h"
-#include "proto_agent.h"
#define DEFAULT_DLF 2680000000
@@ -65,5 +64,6 @@ void init_gNB_afterRU(void);
extern int stop_L1L2(module_id_t gnb_id);
extern int restart_L1L2(module_id_t gnb_id);
+void init_pdcp(void);
#endif
diff --git a/executables/nr-ue.c b/executables/nr-ue.c
index dc162a8753b832a84dfe3ee6a76165ce9d46c7c2..9c9ca4db4c50248b9a08ec398455d7772d0327c3 100644
--- a/executables/nr-ue.c
+++ b/executables/nr-ue.c
@@ -18,7 +18,8 @@
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
-
+#define _GNU_SOURCE
+#include <pthread.h>
#include <openair1/PHY/impl_defs_top.h>
#include "executables/nr-uesoftmodem.h"
#include "PHY/phy_extern_nr_ue.h"
@@ -166,10 +167,10 @@ void init_nr_ue_vars(PHY_VARS_NR_UE *ue,
}
// initialize all signal buffers
- init_nr_ue_signal(ue, nb_connected_gNB, abstraction_flag);
+ init_nr_ue_signal(ue, nb_connected_gNB);
// intialize transport
- init_nr_ue_transport(ue, abstraction_flag);
+ init_nr_ue_transport(ue);
// init N_TA offset
init_N_TA_offset(ue);
@@ -776,15 +777,16 @@ void processSlotRX(void *arg) {
PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, UE->Mod_id, ENB_FLAG_NO, mac->crnti, proc->frame_rx, proc->nr_slot_rx, 0);
pdcp_run(&ctxt);
}
- // calling UL_indication to schedule things other than PUSCH (eg, PUCCH)
- rxtxD->ue_sched_mode = NOT_PUSCH;
- processSlotTX(rxtxD);
// Wait for PUSCH processing to finish
notifiedFIFO_elt_t *res;
res = pullTpool(&rxtxD->txFifo,&(get_nrUE_params()->Tpool));
delNotifiedFIFO_elt(res);
+ // calling UL_indication to schedule things other than PUSCH (eg, PUCCH)
+ rxtxD->ue_sched_mode = NOT_PUSCH;
+ processSlotTX(rxtxD);
+
} else {
rxtxD->ue_sched_mode = SCHED_ALL;
processSlotTX(rxtxD);
@@ -885,26 +887,13 @@ void syncInFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {
}
int computeSamplesShift(PHY_VARS_NR_UE *UE) {
-
- // compute TO compensation that should be applied for this frame
- if ( UE->rx_offset < UE->frame_parms.samples_per_frame/2 &&
- UE->rx_offset > 0 ) {
- LOG_I(PHY,"!!!adjusting -1 samples!!! rx_offset == %d\n", UE->rx_offset);
- UE->rx_offset = 0; // reset so that it is not applied falsely in case of SSB being only in every second frame
- UE->max_pos_fil = 0; // reset IIR filter when sample shift is applied
- return -1 ;
+ int samples_shift = -(UE->rx_offset>>1);
+ UE->rx_offset = 0; // reset so that it is not applied falsely in case of SSB being only in every second frame
+ UE->max_pos_fil = 0; // reset IIR filter when sample shift is applied
+ if (samples_shift != 0) {
+ LOG_I(NR_PHY,"Adjusting frame in time by %i samples\n", samples_shift);
}
-
- if ( UE->rx_offset > UE->frame_parms.samples_per_frame/2 &&
- UE->rx_offset < UE->frame_parms.samples_per_frame ) {
- int rx_offset = UE->rx_offset - UE->frame_parms.samples_per_frame;
- LOG_I(PHY,"!!!adjusting +1 samples!!! rx_offset == %d\n", rx_offset);
- UE->rx_offset = 0; // reset so that it is not applied falsely in case of SSB being only in every second frame
- UE->max_pos_fil = 0; // reset IIR filter when sample shift is applied
- return 1;
- }
-
- return 0;
+ return samples_shift;
}
static inline int get_firstSymSamp(uint16_t slot, NR_DL_FRAME_PARMS *fp) {
diff --git a/executables/ocp-gnb.c b/executables/ocp-gnb.c
index 462a07c7073884df12af47c2830efa59abe9bc32..23fd3ae1329737e44470eeb1223632f083cdb0b6 100644
--- a/executables/ocp-gnb.c
+++ b/executables/ocp-gnb.c
@@ -93,7 +93,6 @@ time_stats_t softmodem_stats_rx_sf; // total rx time
// not used but needed for link
openair0_config_t openair0_cfg[MAX_CARDS];
uint16_t slot_ahead=6;
-msc_interface_t msc_interface;
AGENT_RRC_xface *agent_rrc_xface[NUM_MAX_ENB];
AGENT_MAC_xface *agent_mac_xface[NUM_MAX_ENB];
int flexran_agent_start(mid_t mod_id) {
diff --git a/executables/softmodem-common.c b/executables/softmodem-common.c
index 3e20081b18ee32de4bdd2c8bdca47ca1eac4507e..12c60e98fdf17446583e96da7ba9938dce09ff4e 100644
--- a/executables/softmodem-common.c
+++ b/executables/softmodem-common.c
@@ -45,7 +45,6 @@
static softmodem_params_t softmodem_params;
char *parallel_config=NULL;
char *worker_config=NULL;
-msc_interface_t msc_interface;
int usrp_tx_thread = 0;
uint8_t nfapi_mode=0;
diff --git a/executables/softmodem-common.h b/executables/softmodem-common.h
index 9aca677473566301b97a45d51635496ac4a0407d..16014c60249de31967f70c6d22c6d264c0520515 100644
--- a/executables/softmodem-common.h
+++ b/executables/softmodem-common.h
@@ -171,21 +171,17 @@ extern int usrp_tx_thread;
#define CONFIG_HLP_NSA "Enable NSA mode \n"
#define CONFIG_HLP_FLOG "Enable online log \n"
#define CONFIG_HLP_LOGL "Set the global log level, valid options: (4:trace, 3:debug, 2:info, 1:warn, (0:error))\n"
-#define CONFIG_HLP_LOGV "Set the global log verbosity \n"
#define CONFIG_HLP_TELN "Start embedded telnet server \n"
-#define CONFIG_HLP_MSC "Enable the MSC tracing utility \n"
#define CONFIG_FLOG_OPT "R"
#define CONFIG_LOGL_OPT "g"
/*-------------------------------------------------------------------------------------------------------------------------------------------------*/
/* command line parameters for LOG utility */
/* optname helpstr paramflags XXXptr defXXXval type numelt */
/*-------------------------------------------------------------------------------------------------------------------------------------------------*/
-#define START_MSC softmodem_params.start_msc
#define CMDLINE_LOGPARAMS_DESC { \
{CONFIG_FLOG_OPT , CONFIG_HLP_FLOG, 0, uptr:&online_log_messages, defintval:1, TYPE_INT, 0}, \
{CONFIG_LOGL_OPT , CONFIG_HLP_LOGL, 0, uptr:&glog_level, defintval:0, TYPE_UINT, 0}, \
{"telnetsrv", CONFIG_HLP_TELN, PARAMFLAG_BOOL, uptr:&start_telnetsrv, defintval:0, TYPE_UINT, 0}, \
- {"msc", CONFIG_HLP_MSC, PARAMFLAG_BOOL, uptr:&START_MSC, defintval:0, TYPE_UINT, 0}, \
{"log-mem", NULL, 0, strptr:(char **)&logmem_filename, defstrval:NULL, TYPE_STRING, 0}, \
{"telnetclt", NULL, 0, uptr:&start_telnetclt, defstrval:NULL, TYPE_UINT, 0}, \
}
@@ -250,7 +246,6 @@ typedef struct {
int chain_offset;
int numerology;
int band;
- unsigned int start_msc;
uint32_t clock_source;
uint32_t timing_source;
int hw_timing_advance;
diff --git a/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_constants.h b/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_constants.h
index f107b5b9736c6418d12a896f8628fd4c24d8c909..7fb42e566aa5c1812ef62394ff5c458c753a444b 100644
--- a/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_constants.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_constants.h
@@ -46,7 +46,9 @@
#define FAPI_NR_DL_CONFIG_TYPE_RA_DLSCH 0x03
#define FAPI_NR_DL_CONFIG_TYPE_SI_DLSCH 0x04
#define FAPI_NR_DL_CONFIG_TYPE_P_DLSCH 0x05
-#define FAPI_NR_DL_CONFIG_TYPES 0x05
+#define FAPI_NR_DL_CONFIG_TYPE_CSI_RS 0x06
+#define FAPI_NR_DL_CONFIG_TYPE_CSI_IM 0x07
+#define FAPI_NR_DL_CONFIG_TYPES 0x07
#define FAPI_NR_CCE_REG_MAPPING_TYPE_INTERLEAVED 0x01
#define FAPI_NR_CCE_REG_MAPPING_TYPE_NON_INTERLEAVED 0x02
diff --git a/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h b/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
index dac75bd6ec542d5b654fb59a46adae660ae59721..284ef22fc4c8fe9f72007c82aee0e3a63d49930e 100644
--- a/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
@@ -473,11 +473,53 @@ typedef struct {
fapi_nr_dl_config_dlsch_pdu_rel15_t dlsch_config_rel15;
} fapi_nr_dl_config_dlsch_pdu;
+
+typedef struct {
+ uint16_t bwp_size;//
+ uint16_t bwp_start;//
+ uint8_t subcarrier_spacing;//
+ uint8_t cyclic_prefix;//
+ uint16_t start_rb;
+ uint16_t nr_of_rbs;
+ uint8_t csi_type;//Value: 0:TRS 1:CSI-RS NZP 2:CSI-RS ZP
+ uint8_t row;//Row entry into the CSI Resource location table. [TS38.211, sec 7.4.1.5.3 and table 7.4.1.5.3-1] Value: 1-18
+ uint16_t freq_domain;//Value: Up to the 12 LSBs, actual size is determined by the Row parameter
+ uint8_t symb_l0;//The time domain location l0 and firstOFDMSymbolInTimeDomain Value: 0->13
+ uint8_t symb_l1;//
+ uint8_t cdm_type;
+ uint8_t freq_density;//The density field, p and comb offset (for dot5).0: dot5 (even RB), 1: dot5 (odd RB), 2: one, 3: three
+ uint16_t scramb_id;//ScramblingID of the CSI-RS [TS38.214, sec 5.2.2.3.1] Value: 0->1023
+} fapi_nr_dl_config_csirs_pdu_rel15_t;
+
+
+typedef struct {
+ uint16_t bwp_size;
+ uint16_t bwp_start;
+ uint8_t subcarrier_spacing;
+ uint16_t start_rb;
+ uint16_t nr_of_rbs;
+ uint8_t k_csiim[4];
+ uint8_t l_csiim[4];
+} fapi_nr_dl_config_csiim_pdu_rel15_t;
+
+
+typedef struct {
+ fapi_nr_dl_config_csirs_pdu_rel15_t csirs_config_rel15;
+} fapi_nr_dl_config_csirs_pdu;
+
+
+typedef struct {
+ fapi_nr_dl_config_csiim_pdu_rel15_t csiim_config_rel15;
+} fapi_nr_dl_config_csiim_pdu;
+
+
typedef struct {
uint8_t pdu_type;
union {
fapi_nr_dl_config_dci_pdu dci_config_pdu;
fapi_nr_dl_config_dlsch_pdu dlsch_config_pdu;
+ fapi_nr_dl_config_csirs_pdu csirs_config_pdu;
+ fapi_nr_dl_config_csiim_pdu csiim_config_pdu;
};
} fapi_nr_dl_config_request_pdu_t;
diff --git a/openair1/PHY/CODING/TESTBENCH/ldpctest.c b/openair1/PHY/CODING/TESTBENCH/ldpctest.c
index 371deba3f28546e5a01f0107c03f88e2fa6b8c14..58d649d0119b35edcd1781042acd9b52dc0cc354 100644
--- a/openair1/PHY/CODING/TESTBENCH/ldpctest.c
+++ b/openair1/PHY/CODING/TESTBENCH/ldpctest.c
@@ -25,6 +25,7 @@
#include <string.h>
#include "assertions.h"
#include "SIMULATION/TOOLS/sim.h"
+#include "common/utils/load_module_shlib.h"
#include "PHY/CODING/nrLDPC_extern.h"
//#include "openair1/SIMULATION/NR_PHY/nr_unitary_defs.h"
#include "openair1/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.h"
@@ -118,15 +119,13 @@ int test_ldpc(short No_iteration,
//short test_input[block_length];
unsigned char *test_input[MAX_NUM_NR_DLSCH_SEGMENTS]={NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};;
//short *c; //padded codeword
- unsigned char *estimated_output[MAX_NUM_DLSCH_SEGMENTS];
- unsigned char *estimated_output_bit[MAX_NUM_DLSCH_SEGMENTS];
- unsigned char *test_input_bit;
+ unsigned char estimated_output[MAX_NUM_DLSCH_SEGMENTS][block_length];
+ memset(estimated_output, 0, sizeof(estimated_output));
unsigned char *channel_input[MAX_NUM_DLSCH_SEGMENTS];
- unsigned char *channel_output_uncoded[MAX_NUM_DLSCH_SEGMENTS];
unsigned char *channel_input_optim[MAX_NUM_DLSCH_SEGMENTS];
- double *channel_output;
- double *modulated_input[MAX_NUM_DLSCH_SEGMENTS];
- char *channel_output_fixed[MAX_NUM_DLSCH_SEGMENTS];
+ //double channel_output[68 * 384];
+ double modulated_input[MAX_NUM_DLSCH_SEGMENTS][68 * 384] = { 0 };
+ char channel_output_fixed[MAX_NUM_DLSCH_SEGMENTS][68 * 384] = { 0 };
unsigned int i,j,trial=0;
short BG=0,nrows=0;//,ncols;
int no_punctured_columns,removed_bit;
@@ -155,24 +154,12 @@ int test_ldpc(short No_iteration,
// generate input block
for(j=0;j<MAX_NUM_DLSCH_SEGMENTS;j++) {
test_input[j]=(unsigned char *)malloc16(sizeof(unsigned char) * block_length/8);
+ memset(test_input[j], 0, sizeof(unsigned char) * block_length / 8);
channel_input[j] = (unsigned char *)malloc16(sizeof(unsigned char) * 68*384);
+ memset(channel_input[j], 0, sizeof(unsigned char) * 68 * 384);
channel_input_optim[j] = (unsigned char *)malloc16(sizeof(unsigned char) * 68*384);
- channel_output_uncoded[j] = (unsigned char *)malloc16(sizeof(unsigned char) * 68*384);
- estimated_output[j] = (unsigned char*) malloc16(sizeof(unsigned char) * block_length);
- estimated_output_bit[j] = (unsigned char*) malloc16(sizeof(unsigned char) * block_length);
- modulated_input[j] = (double *)malloc16(sizeof(double) * 68*384);
- channel_output_fixed[j] = (char *)malloc16(sizeof( char) * 68*384);
+ memset(channel_input_optim[j], 0, sizeof(unsigned char) * 68 * 384);
}
- //modulated_input = (double *)malloc(sizeof(double) * 68*384);
- //channel_output = (double *)malloc(sizeof(double) * 68*384);
- //channel_output_fixed = (char *)malloc16(sizeof(char) * 68*384);
- //modulated_input = (double *)calloc(68*384, sizeof(double));
- channel_output = (double *)calloc(68*384, sizeof(double));
- //channel_output_fixed = (double *)calloc(68*384, sizeof(double));
- //channel_output_fixed = (unsigned char*)calloc(68*384, sizeof(unsigned char*));
- //estimated_output = (unsigned char*) malloc16(sizeof(unsigned char) * block_length);///8);
- //estimated_output_bit = (unsigned char*) malloc16(sizeof(unsigned char) * block_length);
- test_input_bit = (unsigned char*) malloc16(sizeof(unsigned char) * block_length);
reset_meas(&time);
reset_meas(time_optim);
@@ -319,7 +306,6 @@ int test_ldpc(short No_iteration,
for (i = 0; i < block_length+(nrows-no_punctured_columns) * Zc - removed_bit; i++)
if (channel_input[j][i]!=channel_input_optim[j][i]) {
printf("differ in seg %u pos %u (%u,%u)\n", j, i, channel_input[j][i], channel_input_optim[j][i]);
- free(channel_output);
return (-1);
}
//else{
@@ -367,12 +353,9 @@ int test_ldpc(short No_iteration,
//channel_output_fixed[i] = (char)quantize(1,channel_output_fixed[i],qbits);
//Uncoded BER
- if (channel_output_fixed[j][i]<0)
- channel_output_uncoded[j][i]=1; //QPSK demod
- else
- channel_output_uncoded[j][i]=0;
+ unsigned char channel_output_uncoded = channel_output_fixed[j][i]<0 ? 1 /* QPSK demod */ : 0;
- if (channel_output_uncoded[j][i] != channel_input_optim[j][i-2*Zc])
+ if (channel_output_uncoded != channel_input_optim[j][i-2*Zc])
*errors_bit_uncoded = (*errors_bit_uncoded) + 1;
}
@@ -423,12 +406,10 @@ int test_ldpc(short No_iteration,
for (i=0; i<block_length; i++)
{
- estimated_output_bit[j][i] = (estimated_output[j][i/8]&(1<<(i&7)))>>(i&7);
- test_input_bit[i] = (test_input[j][i/8]&(1<<(i&7)))>>(i&7); // Further correct for multiple segments
- if (estimated_output_bit[j][i] != test_input_bit[i])
- {
+ unsigned char estoutputbit = (estimated_output[j][i/8]&(1<<(i&7)))>>(i&7);
+ unsigned char inputbit = (test_input[j][i/8]&(1<<(i&7)))>>(i&7); // Further correct for multiple segments
+ if (estoutputbit != inputbit)
*errors_bit = (*errors_bit) + 1;
- }
}
//if (*errors == 1000)
@@ -460,17 +441,8 @@ int test_ldpc(short No_iteration,
for(j=0;j<MAX_NUM_DLSCH_SEGMENTS;j++) {
free(test_input[j]);
free(channel_input[j]);
- free(channel_output_uncoded[j]);
free(channel_input_optim[j]);
- free(modulated_input[j]);
- free(channel_output_fixed[j]);
- free(estimated_output[j]);
- free(estimated_output_bit[j]);
}
- //free(modulated_input);
- free(channel_output);
- //free(channel_output_fixed);
- //free(estimated_output);
nrLDPC_free_mem(p_nrLDPC_procBuf);
@@ -728,5 +700,8 @@ int main(int argc, char *argv[])
}
fclose(fd);
+ loader_reset();
+ logTerm();
+
return(0);
}
diff --git a/openair1/PHY/CODING/TESTBENCH/polartest.c b/openair1/PHY/CODING/TESTBENCH/polartest.c
index 8e7e37754259a5b4051303032a55163a378ec36e..18946dac900619eb3d7abd7cedace868755bbff6 100644
--- a/openair1/PHY/CODING/TESTBENCH/polartest.c
+++ b/openair1/PHY/CODING/TESTBENCH/polartest.c
@@ -20,7 +20,7 @@
int main(int argc, char *argv[])
{
- //Default simulation values (Aim for iterations = 1000000.)
+ //Default simulation values (Aim for iterations = 1000000.)
int decoder_int16=0;
int itr, iterations = 1000, arguments, polarMessageType = 0; //0=PBCH, 1=DCI, 2=UCI
double SNRstart = -20.0, SNRstop = 0.0, SNRinc= 0.5; //dB
@@ -158,20 +158,25 @@ if (logFlag){
#endif
}
- uint8_t testArrayLength = ceil(testLength / 32.0);
- uint8_t coderArrayLength = ceil(coderLength / 32.0);
- uint32_t testInput[testArrayLength]; //generate randomly
+ const uint8_t testArrayLength = ceil(testLength / 32.0);
+ const uint8_t coderArrayLength = ceil(coderLength / 32.0);
+ // in the polar code, often uint64_t arrays are used, but we work with
+ // uint32_t arrays below, so realArrayLength is the length that always
+ // satisfies uint64_t array length
+ const uint8_t realArrayLength = ((testArrayLength + 1) / 2) * 2;
+ printf("testArrayLength %d realArrayLength %d\n", testArrayLength, realArrayLength);
+ uint32_t testInput[realArrayLength]; //generate randomly
uint32_t encoderOutput[coderArrayLength];
- uint32_t estimatedOutput[testArrayLength]; //decoder output
- memset(testInput,0,sizeof(uint32_t) * testArrayLength);
+ uint32_t estimatedOutput[realArrayLength]; //decoder output
+ memset(testInput,0,sizeof(uint32_t) * realArrayLength); // does not reset all
memset(encoderOutput,0,sizeof(uint32_t) * coderArrayLength);
- memset(estimatedOutput,0,sizeof(uint32_t) * testArrayLength);
+ memset(estimatedOutput,0,sizeof(uint32_t) * realArrayLength);
uint8_t encoderOutputByte[coderLength];
double modulatedInput[coderLength]; //channel input
double channelOutput[coderLength]; //add noise
int16_t channelOutput_int16[coderLength];
- t_nrPolar_params *currentPtr = nr_polar_params(polarMessageType, testLength, aggregation_level, 1, NULL);
+ t_nrPolar_params *currentPtr = nr_polar_params(polarMessageType, testLength, aggregation_level, true);
#ifdef DEBUG_DCI_POLAR_PARAMS
uint32_t dci_pdu[4];
@@ -206,7 +211,8 @@ if (logFlag){
modulated_input[i]=(-1)/sqrt(2);
channel_output[i] = modulated_input[i] + (gaussdouble(0.0,1.0) * (1/sqrt(2*SNR_lin)));
}
- decoderState = polar_decoder_dci(channel_output, dci_est, currentPtrDCI, NR_POLAR_DECODER_LISTSIZE, rnti);
+ decoderState = polar_decoder_dci(channel_output, dci_est, NR_POLAR_DECODER_LISTSIZE, rnti,
+ 1, size, aggregation_level);
printf("dci_est: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n", dci_est[0], dci_est[1], dci_est[2], dci_est[3]);
free(encoder_outputByte);
free(channel_output);
@@ -239,13 +245,13 @@ if (logFlag){
start_meas(&timeEncoder);
if (decoder_int16==1) {
- polar_encoder_fast((uint64_t *)testInput, encoderOutput, 0, 0, currentPtr);
+ polar_encoder_fast((uint64_t *)testInput, encoderOutput, 0, 0, polarMessageType, testLength, aggregation_level);
//polar_encoder_fast((uint64_t*)testInput, (uint64_t*)encoderOutput,0,0,currentPtr);
} else { //0 --> PBCH, 1 --> DCI, -1 --> UCI
if (polarMessageType == 0)
- polar_encoder(testInput, encoderOutput, currentPtr);
+ polar_encoder(testInput, encoderOutput, polarMessageType, testLength, aggregation_level);
else if (polarMessageType == 1)
- polar_encoder_dci(testInput, encoderOutput, currentPtr, rnti);
+ polar_encoder_dci(testInput, encoderOutput, rnti, polarMessageType, testLength, aggregation_level);
}
stop_meas(&timeEncoder);
@@ -276,19 +282,20 @@ if (logFlag){
start_meas(&timeDecoder);
if (decoder_int16==1) {
- decoderState = polar_decoder_int16(channelOutput_int16, (uint64_t *)estimatedOutput, 0, currentPtr);
+ decoderState = polar_decoder_int16(channelOutput_int16, (uint64_t *)estimatedOutput, 0,
+ polarMessageType, testLength, aggregation_level);
} else { //0 --> PBCH, 1 --> DCI, -1 --> UCI
if (polarMessageType == 0) {
- decoderState = polar_decoder(channelOutput,
- estimatedOutput,
- currentPtr,
- decoderListSize);
+ decoderState = polar_decoder(channelOutput,
+ estimatedOutput,
+ decoderListSize,
+ polarMessageType, testLength, aggregation_level);
} else if (polarMessageType == 1) {
- decoderState = polar_decoder_dci(channelOutput,
- estimatedOutput,
- currentPtr,
- decoderListSize,
- rnti);
+ decoderState = polar_decoder_dci(channelOutput,
+ estimatedOutput,
+ decoderListSize,
+ rnti,
+ polarMessageType, testLength, aggregation_level);
}
}
stop_meas(&timeDecoder);
@@ -334,9 +341,9 @@ if (logFlag){
decoderState=0;
nBitError=0;
blockErrorState=0;
- memset(testInput,0,sizeof(uint32_t) * testArrayLength);
+ memset(testInput,0,sizeof(uint32_t) * realArrayLength);
memset(encoderOutput,0,sizeof(uint32_t) * coderArrayLength);
- memset(estimatedOutput,0,sizeof(uint32_t) * testArrayLength);
+ memset(estimatedOutput,0,sizeof(uint32_t) * realArrayLength);
}
//Calculate error statistics for the SNR.
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c b/openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c
index 461eb7d6f699d577ab9df125c200a273546f3f05..3a484ff99115d9c7dbb88b0409d83e96fd8781c5 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c
@@ -29,12 +29,13 @@ uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits){
uint8_t crcPolynomialSize = 24;
uint8_t temp1[crcPolynomialSize], temp2[crcPolynomialSize];
- uint8_t **crc_generator_matrix = malloc(payloadSizeBits * sizeof(uint8_t *));
+ uint8_t **crc_generator_matrix = malloc(payloadSizeBits*sizeof(uint8_t *) + payloadSizeBits*crcPolynomialSize*sizeof(uint8_t));
if (crc_generator_matrix)
for (int i = 0; i < payloadSizeBits; i++)
- crc_generator_matrix[i] = malloc(crcPolynomialSize * sizeof(uint8_t));
+ crc_generator_matrix[i] = ((uint8_t*)&crc_generator_matrix[payloadSizeBits])+i*crcPolynomialSize;
- for (int i = 0; i < crcPolynomialSize; i++) crc_generator_matrix[payloadSizeBits-1][i]=crcPolynomialPattern[i+1];
+ for (int i = 0; i < crcPolynomialSize; i++)
+ crc_generator_matrix[payloadSizeBits-1][i]=crcPolynomialPattern[i+1];
for (int i = payloadSizeBits-2; i >= 0; i--){
for (int j = 0; j < crcPolynomialSize-1; j++) temp1[j]=crc_generator_matrix[i+1][j+1];
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
index 8fe115b23a1aed0416503985d2793be985634c82..62ce034f5990b3d93a0db616efe88f562e111501 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
@@ -39,19 +39,44 @@
#include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
#include "assertions.h"
+static inline void updateCrcChecksum2(int xlen,
+ int ylen,
+ uint8_t crcChecksum[xlen][ylen],
+ int gxlen,
+ int gylen,
+ uint8_t crcGen[gxlen][gylen],
+ uint8_t listSize,
+ uint32_t i2,
+ uint8_t len)
+{
+ for (uint8_t i = 0; i < listSize; i++) {
+ for (uint8_t j = 0; j < len; j++) {
+ crcChecksum[j][i+listSize] = ( (crcChecksum[j][i] + crcGen[i2][j]) % 2 );
+ }
+ }
+}
+
int8_t polar_decoder(double *input,
uint32_t *out,
- const t_nrPolar_params *polarParams,
- uint8_t listSize)
+ uint8_t listSize,
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level
+ )
{
+ t_nrPolar_params *polarParams=nr_polar_params(messageType, messageLength, aggregation_level, true);
//Assumes no a priori knowledge.
- uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
- double *pathMetric = malloc(sizeof(double)*(2*listSize));
- uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
+ uint8_t bit[polarParams->N][polarParams->n+1][2*listSize];
+ memset(bit,0,sizeof bit);
+ uint8_t bitUpdated[polarParams->N][polarParams->n+1]; //0=False, 1=True
+ memset(bitUpdated,0,sizeof bitUpdated);
+ uint8_t llrUpdated[polarParams->N][polarParams->n+1]; //0=False, 1=True
+ memset(llrUpdated,0,sizeof llrUpdated);
+ double llr[polarParams->N][polarParams->n+1][2*listSize];
+ uint8_t crcChecksum[polarParams->crcParityBits][2*listSize];
+ memset(crcChecksum,0,sizeof crcChecksum);
+ double pathMetric[2*listSize];
+ uint8_t crcState[2*listSize]; //0=False, 1=True
for (int i=0; i<(2*listSize); i++) {
pathMetric[i] = 0;
@@ -63,13 +88,8 @@ int8_t polar_decoder(double *input,
bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
}
- uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
- uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2
-
- for (int i = 0; i < polarParams->K; i++) {
- extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- }
+ uint8_t extended_crc_generator_matrix[polarParams->K][polarParams->crcParityBits]; //G_P3
+ uint8_t tempECGM[polarParams->K][polarParams->crcParityBits]; //G_P2
for (int i=0; i<polarParams->payloadBits; i++) {
for (int j=0; j<polarParams->crcParityBits; j++) {
@@ -102,7 +122,7 @@ int8_t polar_decoder(double *input,
}
}
- double *d_tilde = malloc(sizeof(double) * polarParams->N);
+ double d_tilde[polarParams->N];
nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
@@ -117,31 +137,33 @@ int8_t polar_decoder(double *input,
uint8_t listIndex[2*listSize], copyIndex;
for (uint16_t currentBit=0; currentBit<polarParams->N; currentBit++) {
- updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1));
+ updateLLR(currentListSize, currentBit, 0, polarParams->N, polarParams->n+1, 2*listSize, llr, llrUpdated, bit, bitUpdated);
if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
- updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit);
+ updatePathMetric(pathMetric, currentListSize, 0, currentBit, polarParams->N, polarParams->n+1, 2*listSize, llr);
} else { //Information or CRC bit.
- updatePathMetric2(pathMetric, llr, currentListSize, currentBit);
+ updatePathMetric2(pathMetric, currentListSize, currentBit, polarParams->N, polarParams->n+1, 2*listSize, llr);
for (int i = 0; i < currentListSize; i++) {
- for (int j = 0; j < polarParams->N; j++) {
- for (int k = 0; k < (polarParams->n+1); k++) {
+ for (int j = 0; j < polarParams->N; j++) {
+ for (int k = 0; k < (polarParams->n+1); k++) {
bit[j][k][i+currentListSize]=bit[j][k][i];
llr[j][k][i+currentListSize]=llr[j][k][i];
}
- }
+ }
}
- for (int i = 0; i < currentListSize; i++) {
- bit[currentBit][0][i]=0;
- crcState[i+currentListSize]=crcState[i];
- }
+ for (int i = 0; i < currentListSize; i++) {
+ bit[currentBit][0][i]=0;
+ crcState[i+currentListSize]=crcState[i];
+ }
for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
bitUpdated[currentBit][0]=1;
- updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ updateCrcChecksum2(polarParams->crcParityBits, 2*listSize, crcChecksum,
+ polarParams->K, polarParams->crcParityBits, extended_crc_generator_matrix,
+ currentListSize, nonFrozenBit, polarParams->crcParityBits);
currentListSize*=2;
//Keep only the best "listSize" number of entries.
@@ -246,14 +268,7 @@ int8_t polar_decoder(double *input,
if (decoderIterationCheck==0) {
//perror("[SCL polar decoder] All list entries have failed the CRC checks.");
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- free(tempECGM);
- return(-1);
+ polarReturn(-1);
}
nonFrozenBit++;
@@ -282,33 +297,34 @@ int8_t polar_decoder(double *input,
}
}
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
- nr_free_uint8_2D_array(tempECGM, polarParams->K);
/*
* Return bits.
*/
nr_byte2bit_uint8_32(polarParams->nr_polar_A, polarParams->payloadBits, out);
- return(0);
+
+ polarReturn 0;
}
int8_t polar_decoder_dci(double *input,
uint32_t *out,
- const t_nrPolar_params *polarParams,
uint8_t listSize,
- uint16_t n_RNTI) {
- uint8_t ***bit = nr_alloc_uint8_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **bitUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- uint8_t **llrUpdated = nr_alloc_uint8_2D_array(polarParams->N, (polarParams->n+1)); //0=False, 1=True
- double ***llr = nr_alloc_double_3D_array(polarParams->N, (polarParams->n+1), 2*listSize);
- uint8_t **crcChecksum = nr_alloc_uint8_2D_array(polarParams->crcParityBits, 2*listSize);
- double *pathMetric = malloc(sizeof(double)*(2*listSize));
- uint8_t *crcState = malloc(sizeof(uint8_t)*(2*listSize)); //0=False, 1=True
+ uint16_t n_RNTI,
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level ) {
+ t_nrPolar_params *polarParams=nr_polar_params(messageType, messageLength, aggregation_level, true);
+
+ uint8_t bit[polarParams->N][polarParams->n+1][2*listSize];
+ memset(bit,0,sizeof bit);
+ uint8_t bitUpdated[polarParams->N][polarParams->n+1]; //0=False, 1=True
+ memset(bitUpdated,0,sizeof bitUpdated);
+ uint8_t llrUpdated[polarParams->N][polarParams->n+1]; //0=False, 1=True
+ memset(llrUpdated,0,sizeof llrUpdated);
+ double llr[polarParams->N][polarParams->n+1][2*listSize];
+ uint8_t crcChecksum[polarParams->crcParityBits][2*listSize];
+ memset(crcChecksum,0,sizeof crcChecksum);
+ double pathMetric[2*listSize];
+ uint8_t crcState[2*listSize]; //0=False, 1=True
uint8_t extended_crc_scrambling_pattern[polarParams->crcParityBits];
for (int i=0; i<(2*listSize); i++) {
@@ -321,13 +337,8 @@ int8_t polar_decoder_dci(double *input,
bitUpdated[i][0]=((polarParams->information_bit_pattern[i]+1) % 2);
}
- uint8_t **extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3: K-by-P
- uint8_t **tempECGM = malloc(polarParams->K * sizeof(uint8_t *)); //G_P2: K-by-P
-
- for (int i = 0; i < polarParams->K; i++) {
- extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- tempECGM[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
- }
+ uint8_t extended_crc_generator_matrix[polarParams->K][polarParams->crcParityBits]; //G_P3: K-by-P
+ uint8_t tempECGM[polarParams->K][polarParams->crcParityBits]; //G_P2: K-by-P
for (int i=0; i<polarParams->payloadBits; i++) {
for (int j=0; j<polarParams->crcParityBits; j++) {
@@ -366,17 +377,19 @@ int8_t polar_decoder_dci(double *input,
extended_crc_scrambling_pattern[i]=(n_RNTI>>(23-i))&1;
}
- double *d_tilde = malloc(sizeof(double) * polarParams->N);
+ double d_tilde[polarParams->N];
nr_polar_rate_matching(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
- for (int j = 0; j < polarParams->N; j++) llr[j][polarParams->n][0]=d_tilde[j];
+ for (int j = 0; j < polarParams->N; j++)
+ llr[j][polarParams->n][0]=d_tilde[j];
/*
* SCL polar decoder.
*/
for (int i=0; i<polarParams->crcParityBits; i++) {
- for (int j=0; j<polarParams->crcParityBits; j++) crcChecksum[i][0]=crcChecksum[i][0]+polarParams->crc_generator_matrix[j][i];
+ for (int j=0; j<polarParams->crcParityBits; j++)
+ crcChecksum[i][0]=crcChecksum[i][0]+polarParams->crc_generator_matrix[j][i];
crcChecksum[i][0]=(crcChecksum[i][0]%2);
}
@@ -388,12 +401,12 @@ int8_t polar_decoder_dci(double *input,
uint8_t listIndex[2*listSize], copyIndex;
for (uint16_t currentBit=0; currentBit<polarParams->N; currentBit++) {
- updateLLR(llr, llrUpdated, bit, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1));
+ updateLLR(currentListSize, currentBit, 0, polarParams->N, polarParams->n+1, 2*listSize, llr, llrUpdated, bit, bitUpdated);
if (polarParams->information_bit_pattern[currentBit]==0) { //Frozen bit.
- updatePathMetric(pathMetric, llr, currentListSize, 0, currentBit);
+ updatePathMetric(pathMetric, currentListSize, 0, currentBit,polarParams->N, polarParams->n+1, 2*listSize, llr);
} else { //Information or CRC bit.
- updatePathMetric2(pathMetric, llr, currentListSize, currentBit);
+ updatePathMetric2(pathMetric, currentListSize, currentBit, polarParams->N, polarParams->n+1, 2*listSize, llr);
for (int i = 0; i < currentListSize; i++) {
for (int j = 0; j < polarParams->N; j++) {
@@ -412,7 +425,9 @@ int8_t polar_decoder_dci(double *input,
for (int i = currentListSize; i < 2*currentListSize; i++) bit[currentBit][0][i]=1;
bitUpdated[currentBit][0]=1;
- updateCrcChecksum2(crcChecksum, extended_crc_generator_matrix, currentListSize, nonFrozenBit, polarParams->crcParityBits);
+ updateCrcChecksum2(polarParams->crcParityBits, 2*listSize, crcChecksum,
+ polarParams->K, polarParams->crcParityBits, extended_crc_generator_matrix,
+ currentListSize, nonFrozenBit, polarParams->crcParityBits);
currentListSize*=2;
//Keep only the best "listSize" number of entries.
@@ -513,18 +528,12 @@ int8_t polar_decoder_dci(double *input,
}
}
- for (uint8_t i = 0; i < currentListSize; i++) decoderIterationCheck+=crcState[i];
+ for (uint8_t i = 0; i < currentListSize; i++)
+ decoderIterationCheck+=crcState[i];
if (decoderIterationCheck==0) {
//perror("[SCL polar decoder] All list entries have failed the CRC checks.");
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- free(tempECGM);
- return(-1);
+ polarReturn -1;
}
nonFrozenBit++;
@@ -553,19 +562,12 @@ int8_t polar_decoder_dci(double *input,
}
}
- free(d_tilde);
- free(pathMetric);
- free(crcState);
- nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
- nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
- nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
- nr_free_uint8_2D_array(extended_crc_generator_matrix, polarParams->K);
- nr_free_uint8_2D_array(tempECGM, polarParams->K);
/*
* Return bits.
*/
nr_byte2bit_uint8_32(polarParams->nr_polar_A, polarParams->payloadBits, out);
- return(0);
+
+ polarReturn 0;
}
void init_polar_deinterleaver_table(t_nrPolar_params *polarParams) {
@@ -604,8 +606,11 @@ void init_polar_deinterleaver_table(t_nrPolar_params *polarParams) {
uint32_t polar_decoder_int16(int16_t *input,
uint64_t *out,
uint8_t ones_flag,
- const t_nrPolar_params *polarParams)
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level )
{
+ t_nrPolar_params *polarParams=nr_polar_params(messageType, messageLength, aggregation_level, true);
int16_t d_tilde[polarParams->N];// = malloc(sizeof(double) * polarParams->N);
nr_polar_rate_matching_int16(input, d_tilde, polarParams->rate_matching_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
@@ -702,5 +707,6 @@ uint32_t polar_decoder_int16(int16_t *input,
rxcrc,polarParams->payloadBits);
#endif
out[0]=Ar;
- return(crc^rxcrc);
+
+ polarReturn crc^rxcrc;
}
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
index 42d500ae8670f509e3ccecde96558d0e102d8fcd..b201db2ba62211209075bcccae40e0e166454659 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
@@ -36,63 +36,86 @@
//#define DEBUG_NEW_IMPL 1
-void updateLLR(double ***llr,
- uint8_t **llrU,
- uint8_t ***bit,
- uint8_t **bitU,
- uint8_t listSize,
- uint16_t row,
- uint16_t col,
- uint16_t xlen,
- uint8_t ylen)
+
+static inline void updateBit(uint8_t listSize,
+ uint16_t row,
+ uint16_t col,
+ uint16_t xlen,
+ uint8_t ylen,
+ int zlen,
+ uint8_t bit[xlen][ylen][zlen],
+ uint8_t bitU[xlen][ylen])
{
- uint16_t offset = (xlen/(pow(2,(ylen-col-1))));
+ uint16_t offset = ( xlen/(pow(2,(ylen-col))) );
+
for (uint8_t i=0; i<listSize; i++) {
if (( (row) % (2*offset) ) >= offset ) {
- if(bitU[row-offset][col]==0) updateBit(bit, bitU, listSize, (row-offset), col, xlen, ylen);
- if(llrU[row-offset][col+1]==0) updateLLR(llr, llrU, bit, bitU, listSize, (row-offset), (col+1), xlen, ylen);
- if(llrU[row][col+1]==0) updateLLR(llr, llrU, bit, bitU, listSize, row, (col+1), xlen, ylen);
- llr[row][col][i] = (pow((-1),bit[row-offset][col][i])*llr[row-offset][col+1][i]) + llr[row][col+1][i];
+ if (bitU[row][col-1]==0) updateBit(listSize, row, (col-1), xlen, ylen, zlen, bit, bitU);
+ bit[row][col][i] = bit[row][col-1][i];
} else {
- if(llrU[row][col+1]==0) updateLLR(llr, llrU, bit, bitU, listSize, row, (col+1), xlen, ylen);
- if(llrU[row+offset][col+1]==0) updateLLR(llr, llrU, bit, bitU, listSize, (row+offset), (col+1), xlen, ylen);
- computeLLR(llr, row, col, i, offset);
+ if (bitU[row][col-1]==0) updateBit(listSize, row, (col-1), xlen, ylen, zlen, bit, bitU);
+ if (bitU[row+offset][col-1]==0) updateBit(listSize, (row+offset), (col-1), xlen, ylen, zlen, bit, bitU);
+ bit[row][col][i] = ( (bit[row][col-1][i]+bit[row+offset][col-1][i]) % 2);
}
}
- llrU[row][col]=1;
- // printf("LLR (a %f, b %f): llr[%d][%d] %f\n",32*a,32*b,col,row,32*llr[col][row]);
+ bitU[row][col]=1;
}
-void updateBit(uint8_t ***bit,
- uint8_t **bitU,
- uint8_t listSize,
- uint16_t row,
- uint16_t col,
- uint16_t xlen,
- uint8_t ylen)
+static inline void computeLLR(uint16_t row,
+ uint16_t col,
+ uint8_t i,
+ uint16_t offset,
+ int xlen,
+ int ylen,
+ int zlen,
+ double llr[xlen][ylen][zlen])
{
- uint16_t offset = ( xlen/(pow(2,(ylen-col))) );
+ double a = llr[row][col + 1][i];
+ double b = llr[row + offset][col + 1][i];
+ llr[row][col][i] = log((exp(a + b) + 1) / (exp(a) + exp(b))); //eq. (8a)
+}
+
+void updateLLR(uint8_t listSize,
+ uint16_t row,
+ uint16_t col,
+ uint16_t xlen,
+ uint8_t ylen,
+ int zlen,
+ double llr[xlen][ylen][zlen],
+ uint8_t llrU[xlen][ylen],
+ uint8_t bit[xlen][ylen][zlen],
+ uint8_t bitU[xlen][ylen]
+ )
+{
+ uint16_t offset = (xlen/(pow(2,(ylen-col-1))));
for (uint8_t i=0; i<listSize; i++) {
if (( (row) % (2*offset) ) >= offset ) {
- if (bitU[row][col-1]==0) updateBit(bit, bitU, listSize, row, (col-1), xlen, ylen);
- bit[row][col][i] = bit[row][col-1][i];
+ if(bitU[row-offset][col]==0) updateBit(listSize, (row-offset), col, xlen, ylen, zlen, bit, bitU);
+ if(llrU[row-offset][col+1]==0) updateLLR(listSize, (row-offset), (col+1), xlen, ylen, zlen, llr, llrU, bit, bitU );
+ if(llrU[row][col+1]==0) updateLLR(listSize, row, (col+1), xlen, ylen, zlen, llr, llrU, bit, bitU);
+ llr[row][col][i] = (pow((-1),bit[row-offset][col][i])*llr[row-offset][col+1][i]) + llr[row][col+1][i];
} else {
- if (bitU[row][col-1]==0) updateBit(bit, bitU, listSize, row, (col-1), xlen, ylen);
- if (bitU[row+offset][col-1]==0) updateBit(bit, bitU, listSize, (row+offset), (col-1), xlen, ylen);
- bit[row][col][i] = ( (bit[row][col-1][i]+bit[row+offset][col-1][i]) % 2);
+ if(llrU[row][col+1]==0) updateLLR(listSize, row, (col+1), xlen, ylen, zlen, llr, llrU, bit, bitU );
+ if(llrU[row+offset][col+1]==0) updateLLR(listSize, (row+offset), (col+1), xlen, ylen, zlen, llr, llrU, bit, bitU );
+ computeLLR(row, col, i, offset, xlen, ylen, zlen, llr);
}
}
+ llrU[row][col]=1;
- bitU[row][col]=1;
+ // printf("LLR (a %f, b %f): llr[%d][%d] %f\n",32*a,32*b,col,row,32*llr[col][row]);
}
void updatePathMetric(double *pathMetric,
- double ***llr,
- uint8_t listSize,
- uint8_t bitValue,
- uint16_t row)
+ uint8_t listSize,
+ uint8_t bitValue,
+ uint16_t row,
+ int xlen,
+ int ylen,
+ int zlen,
+ double llr[xlen][ylen][zlen]
+ )
{
int8_t multiplier = (2*bitValue) - 1;
for (uint8_t i=0; i<listSize; i++)
@@ -101,11 +124,14 @@ void updatePathMetric(double *pathMetric,
}
void updatePathMetric2(double *pathMetric,
- double ***llr,
- uint8_t listSize,
- uint16_t row)
+ uint8_t listSize,
+ uint16_t row,
+ int xlen,
+ int ylen,
+ int zlen,
+ double llr[xlen][ylen][zlen])
{
- double *tempPM = malloc(sizeof(double) * listSize);
+ double tempPM[listSize];
memcpy(tempPM, pathMetric, (sizeof(double) * listSize));
uint8_t bitValue = 0;
@@ -118,48 +144,8 @@ void updatePathMetric2(double *pathMetric,
for (uint8_t i = listSize; i < 2*listSize; i++)
pathMetric[i] = tempPM[(i-listSize)] + log(1 + exp(multiplier * llr[row][0][(i-listSize)])); //eq. (11b)
- free(tempPM);
}
-void computeLLR(double ***llr,
- uint16_t row,
- uint16_t col,
- uint8_t i,
- uint16_t offset)
-{
- double a = llr[row][col + 1][i];
- double b = llr[row + offset][col + 1][i];
- llr[row][col][i] = log((exp(a + b) + 1) / (exp(a) + exp(b))); //eq. (8a)
-}
-
-void updateCrcChecksum(uint8_t **crcChecksum,
- uint8_t **crcGen,
- uint8_t listSize,
- uint32_t i2,
- uint8_t len)
-{
- for (uint8_t i = 0; i < listSize; i++) {
- for (uint8_t j = 0; j < len; j++) {
- crcChecksum[j][i] = ( (crcChecksum[j][i] + crcGen[i2][j]) % 2 );
- }
- }
-}
-
-void updateCrcChecksum2(uint8_t **crcChecksum,
- uint8_t **crcGen,
- uint8_t listSize,
- uint32_t i2,
- uint8_t len)
-{
- for (uint8_t i = 0; i < listSize; i++) {
- for (uint8_t j = 0; j < len; j++) {
- crcChecksum[j][i+listSize] = ( (crcChecksum[j][i] + crcGen[i2][j]) % 2 );
- }
- }
-}
-
-
-
decoder_node_t *new_decoder_node(int first_leaf_index, int level) {
decoder_node_t *node=(decoder_node_t *)malloc(sizeof(decoder_node_t));
@@ -222,6 +208,23 @@ decoder_node_t *add_nodes(int level, int first_leaf_index, t_nrPolar_params *pol
return(new_node);
}
+void delete_nodes(decoder_node_t * n) {
+ if (n) {
+ if(n->left)
+ delete_nodes(n->left);
+ if(n->right)
+ delete_nodes(n->right);
+ free(n->alpha);
+ free(n->beta);
+ free(n);
+ }
+}
+
+void delete_decoder_tree(t_nrPolar_params *polarParams) {
+ if (polarParams->tree.root)
+ delete_nodes(polarParams->tree.root);
+}
+
void build_decoder_tree(t_nrPolar_params *polarParams)
{
polarParams->tree.num_nodes=0;
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
index c2e9fd938105fe2846f69f305fe0419632060fa0..79af311e4524901af67b5c16ab60f19a7d6fe1a3 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
@@ -79,9 +79,10 @@ typedef struct decoder_tree_t_s {
struct nrPolar_params {
//messageType: 0=PBCH, 1=DCI, -1=UCI
- int idx; //idx = (messageType * messageLength * aggregation_prime);
- struct nrPolar_params *nextPtr;
+ struct nrPolar_params *nextPtr __attribute__((aligned(16)));
+ bool busy;
+ uint32_t idx;
uint8_t n_max;
uint8_t i_il;
uint8_t i_seg;
@@ -138,34 +139,46 @@ typedef struct nrPolar_params t_nrPolar_params;
void polar_encoder(uint32_t *input,
uint32_t *output,
- const t_nrPolar_params *polarParams);
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level);
void polar_encoder_dci(uint32_t *in,
uint32_t *out,
- const t_nrPolar_params *polarParams,
- uint16_t n_RNTI);
+ uint16_t n_RNTI,
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level);
void polar_encoder_fast(uint64_t *A,
void *out,
int32_t crcmask,
uint8_t ones_flag,
- const t_nrPolar_params *polarParams);
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level);
int8_t polar_decoder(double *input,
uint32_t *output,
- const t_nrPolar_params *polarParams,
- uint8_t listSize);
+ uint8_t listSize,
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level);
uint32_t polar_decoder_int16(int16_t *input,
uint64_t *out,
uint8_t ones_flag,
- const t_nrPolar_params *polarParams);
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level);
int8_t polar_decoder_dci(double *input,
uint32_t *out,
- const t_nrPolar_params *polarParams,
uint8_t listSize,
- uint16_t n_RNTI);
+ uint16_t n_RNTI,
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level);
void generic_polar_decoder(const t_nrPolar_params *pp,
decoder_node_t *node);
@@ -183,13 +196,12 @@ void build_decoder_tree(t_nrPolar_params *pp);
void build_polar_tables(t_nrPolar_params *polarParams);
void init_polar_deinterleaver_table(t_nrPolar_params *polarParams);
-void nr_polar_print_polarParams(t_nrPolar_params *polarParams);
+void nr_polar_print_polarParams(void);
t_nrPolar_params *nr_polar_params (int8_t messageType,
uint16_t messageLength,
uint8_t aggregation_level,
- int decoder_flag,
- t_nrPolar_params **polarList_ext);
+ int decoder_flag);
uint16_t nr_polar_aggregation_prime (uint8_t aggregation_level);
@@ -278,34 +290,6 @@ void nr_matrix_multiplication_uint8_1D_uint8_2D(uint8_t *matrix1,
uint16_t row,
uint16_t col);
-uint8_t ***nr_alloc_uint8_3D_array(uint16_t xlen,
- uint16_t ylen,
- uint16_t zlen);
-
-uint8_t **nr_alloc_uint8_2D_array(uint16_t xlen,
- uint16_t ylen);
-
-double ***nr_alloc_double_3D_array(uint16_t xlen,
- uint16_t ylen,
- uint16_t zlen);
-
-double **nr_alloc_double_2D_array(uint16_t xlen,
- uint16_t ylen);
-
-void nr_free_double_3D_array(double ***input,
- uint16_t xlen,
- uint16_t ylen);
-
-void nr_free_double_2D_array(double **input,
- uint16_t xlen);
-
-void nr_free_uint8_3D_array(uint8_t ***input,
- uint16_t xlen,
- uint16_t ylen);
-
-void nr_free_uint8_2D_array(uint8_t **input,
- uint16_t xlen);
-
void nr_sort_asc_double_1D_array_ind(double *matrix,
uint8_t *ind,
uint8_t len);
@@ -316,52 +300,33 @@ void nr_sort_asc_int16_1D_array_ind(int32_t *matrix,
void nr_free_double_2D_array(double **input, uint16_t xlen);
-void updateLLR(double ***llr,
- uint8_t **llrU,
- uint8_t ***bit,
- uint8_t **bitU,
- uint8_t listSize,
- uint16_t row,
- uint16_t col,
- uint16_t xlen,
- uint8_t ylen);
-
-void updateBit(uint8_t ***bit,
- uint8_t **bitU,
- uint8_t listSize,
- uint16_t row,
- uint16_t col,
- uint16_t xlen,
- uint8_t ylen);
-
+void updateLLR(uint8_t listSize,
+ uint16_t row,
+ uint16_t col,
+ uint16_t xlen,
+ uint8_t ylen,
+ int zlen,
+ double llr[xlen][ylen][zlen],
+ uint8_t llrU[xlen][ylen],
+ uint8_t bit[xlen][ylen][zlen],
+ uint8_t bitU[xlen][ylen]
+ );
void updatePathMetric(double *pathMetric,
- double ***llr,
- uint8_t listSize,
- uint8_t bitValue,
- uint16_t row);
-
+ uint8_t listSize,
+ uint8_t bitValue,
+ uint16_t row,
+ int xlen,
+ int ylen,
+ int zlen,
+ double llr[xlen][ylen][zlen]
+ );
void updatePathMetric2(double *pathMetric,
- double ***llr,
- uint8_t listSize,
- uint16_t row);
-
-void computeLLR(double ***llr,
- uint16_t row,
- uint16_t col,
- uint8_t i,
- uint16_t offset);
-
-void updateCrcChecksum(uint8_t **crcChecksum,
- uint8_t **crcGen,
- uint8_t listSize,
- uint32_t i2,
- uint8_t len);
-
-void updateCrcChecksum2(uint8_t **crcChecksum,
- uint8_t **crcGen,
- uint8_t listSize,
- uint32_t i2,
- uint8_t len);
+ uint8_t listSize,
+ uint16_t row,
+ int xlen,
+ int ylen,
+ int zlen,
+ double llr[xlen][ylen][zlen]);
//Also nr_polar_rate_matcher
static inline void nr_polar_interleaver(uint8_t *input,
@@ -379,5 +344,13 @@ static inline void nr_polar_deinterleaver(uint8_t *input,
{
for (int i=0; i<size; i++) output[pattern[i]]=input[i];
}
+void delete_decoder_tree(t_nrPolar_params *);
+
+extern pthread_mutex_t PolarListMutex;
+#define polarReturn \
+pthread_mutex_lock(&PolarListMutex); \
+polarParams->busy=false; \
+pthread_mutex_unlock(&PolarListMutex); \
+return
#endif
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
index 1dfaed8b941c7810ce9f05f9501fad1ce001b9c0..4cba3fe078353bcb1c61f5e766b3e5dffc74e3dc 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
@@ -43,7 +43,10 @@
void polar_encoder(uint32_t *in,
uint32_t *out,
- const t_nrPolar_params *polarParams) {
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level) {
+ t_nrPolar_params *polarParams=nr_polar_params(messageType, messageLength, aggregation_level, false);
if (1) {//polarParams->idx == 0 || polarParams->idx == 1) { //PBCH or PDCCH
/*
uint64_t B = (((uint64_t)*in)&((((uint64_t)1)<<32)-1)) | (((uint64_t)crc24c((uint8_t*)in,polarParams->payloadBits)>>8)<<polarParams->payloadBits);
@@ -57,10 +60,10 @@ void polar_encoder(uint32_t *in,
*/
//Calculate CRC.
nr_matrix_multiplication_uint8_1D_uint8_2D(polarParams->nr_polar_A,
- polarParams->crc_generator_matrix,
- polarParams->nr_polar_crc,
- polarParams->payloadBits,
- polarParams->crcParityBits);
+ polarParams->crc_generator_matrix,
+ polarParams->nr_polar_crc,
+ polarParams->payloadBits,
+ polarParams->crcParityBits);
for (uint8_t i = 0; i < polarParams->crcParityBits; i++)
polarParams->nr_polar_crc[i] = (polarParams->nr_polar_crc[i] % 2);
@@ -150,12 +153,19 @@ void polar_encoder(uint32_t *in,
#endif
nr_byte2bit_uint8_32(polarParams->nr_polar_E, polarParams->encoderLength, out);
+
+ polarReturn;
+
}
void polar_encoder_dci(uint32_t *in,
uint32_t *out,
- const t_nrPolar_params *polarParams,
- uint16_t n_RNTI) {
+ uint16_t n_RNTI,
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level) {
+ t_nrPolar_params *polarParams=nr_polar_params(messageType, messageLength, aggregation_level, false);
+
#ifdef DEBUG_POLAR_ENCODER_DCI
printf("[polar_encoder_dci] in: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n", in[0], in[1], in[2], in[3]);
#endif
@@ -249,6 +259,7 @@ void polar_encoder_dci(uint32_t *in,
printf("\n[polar_encoder_dci] out: ");
for (int i = 0; i < outputInd; i++) printf("[%d]->0x%08x\t", i, out[i]);
#endif
+ polarReturn;
}
static inline void polar_rate_matching(const t_nrPolar_params *polarParams,void *in,void *out) __attribute__((always_inline));
@@ -334,7 +345,7 @@ void build_polar_tables(t_nrPolar_params *polarParams) {
AssertFatal(polarParams->N==512 || polarParams->N==256 || polarParams->N==128,"N = %d, not done yet\n",polarParams->N);
// build G bit vectors for information bit positions and convert the bit as bytes tables in nr_polar_kronecker_power_matrices.c to 64 bit packed vectors.
// keep only rows of G which correspond to information/crc bits
- polarParams->G_N_tab = (uint64_t **)malloc((polarParams->K + polarParams->n_pc) * sizeof(int64_t *));
+ polarParams->G_N_tab = (uint64_t **)calloc((polarParams->K + polarParams->n_pc),sizeof(int64_t *));
int k=0;
for (int i=0; i<polarParams->N; i++) {
@@ -418,11 +429,14 @@ void polar_encoder_fast(uint64_t *A,
void *out,
int32_t crcmask,
uint8_t ones_flag,
- const t_nrPolar_params *polarParams) {
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level) {
+
+ t_nrPolar_params *polarParams=nr_polar_params(messageType, messageLength, aggregation_level, false);
// AssertFatal(polarParams->K > 32, "K = %d < 33, is not supported yet\n",polarParams->K);
AssertFatal(polarParams->K < 129, "K = %d > 128, is not supported yet\n",polarParams->K);
AssertFatal(polarParams->payloadBits < 65, "payload bits = %d > 64, is not supported yet\n",polarParams->payloadBits);
- uint64_t B[4]= {0,0,0,0},Cprime[4]= {0,0,0,0};
int bitlen = polarParams->payloadBits;
// append crc
AssertFatal(bitlen<129,"support for payloads <= 128 bits\n");
@@ -451,9 +465,12 @@ void polar_encoder_fast(uint64_t *A,
A32_flip[1+offset]=((uint8_t *)&Aprime)[2];
A32_flip[2+offset]=((uint8_t *)&Aprime)[1];
A32_flip[3+offset]=((uint8_t *)&Aprime)[0];
- if (polarParams->crcParityBits == 24) tcrc = (uint64_t)(((crcmask^(crc24c(A32_flip,8*offset+bitlen)>>8)))&0xffffff);
- else if (polarParams->crcParityBits == 11) tcrc = (uint64_t)(((crcmask^(crc11(A32_flip,bitlen)>>21)))&0x7ff);
- else if (polarParams->crcParityBits == 6) tcrc = (uint64_t)(((crcmask^(crc6(A32_flip,bitlen)>>26)))&0x3f);
+ if (polarParams->crcParityBits == 24)
+ tcrc = (uint64_t)(((crcmask^(crc24c(A32_flip,8*offset+bitlen)>>8)))&0xffffff);
+ else if (polarParams->crcParityBits == 11)
+ tcrc = (uint64_t)(((crcmask^(crc11(A32_flip,bitlen)>>21)))&0x7ff);
+ else if (polarParams->crcParityBits == 6)
+ tcrc = (uint64_t)(((crcmask^(crc6(A32_flip,bitlen)>>26)))&0x3f);
} else if (bitlen<=64) {
uint8_t A64_flip[8+offset];
if (ones_flag) {
@@ -470,8 +487,10 @@ void polar_encoder_fast(uint64_t *A,
A64_flip[5+offset]=((uint8_t *)&Aprime)[2];
A64_flip[6+offset]=((uint8_t *)&Aprime)[1];
A64_flip[7+offset]=((uint8_t *)&Aprime)[0];
- if (polarParams->crcParityBits == 24) tcrc = (uint64_t)((crcmask^(crc24c(A64_flip,8*offset+bitlen)>>8)))&0xffffff;
- else if (polarParams->crcParityBits == 11) tcrc = (uint64_t)((crcmask^(crc11(A64_flip,bitlen)>>21)))&0x7ff;
+ if (polarParams->crcParityBits == 24)
+ tcrc = (uint64_t)((crcmask^(crc24c(A64_flip,8*offset+bitlen)>>8)))&0xffffff;
+ else if (polarParams->crcParityBits == 11)
+ tcrc = (uint64_t)((crcmask^(crc11(A64_flip,bitlen)>>21)))&0x7ff;
}
else if (bitlen<=128) {
uint8_t A128_flip[16+offset];
@@ -481,38 +500,37 @@ void polar_encoder_fast(uint64_t *A,
A128_flip[2] = 0xff;
}
uint128_t Aprime= (uint128_t)(((uint128_t)*A)<<(128-bitlen));
- A128_flip[0+offset]=((uint8_t*)&Aprime)[15]; A128_flip[1+offset]=((uint8_t*)&Aprime)[14];
- A128_flip[2+offset]=((uint8_t*)&Aprime)[13]; A128_flip[3+offset]=((uint8_t*)&Aprime)[12];
- A128_flip[4+offset]=((uint8_t*)&Aprime)[11]; A128_flip[5+offset]=((uint8_t*)&Aprime)[10];
- A128_flip[6+offset] =((uint8_t*)&Aprime)[9]; A128_flip[7+offset] =((uint8_t*)&Aprime)[8];
- A128_flip[8+offset] =((uint8_t*)&Aprime)[7]; A128_flip[9+offset] =((uint8_t*)&Aprime)[6];
- A128_flip[10+offset]=((uint8_t*)&Aprime)[5]; A128_flip[11+offset]=((uint8_t*)&Aprime)[4];
- A128_flip[12+offset]=((uint8_t*)&Aprime)[3]; A128_flip[13+offset]=((uint8_t*)&Aprime)[2];
- A128_flip[14+offset]=((uint8_t*)&Aprime)[1]; A128_flip[15+offset]=((uint8_t*)&Aprime)[0];
- if (polarParams->crcParityBits == 24) tcrc = (uint64_t)((crcmask^(crc24c(A128_flip,8*offset+bitlen)>>8)))&0xffffff;
- else if (polarParams->crcParityBits == 11) tcrc = (uint64_t)((crcmask^(crc11(A128_flip,bitlen)>>21)))&0x7ff;
+ for (int i=0; i<16 ; i++)
+ A128_flip[i+offset]=((uint8_t*)&Aprime)[15-i];
+ if (polarParams->crcParityBits == 24)
+ tcrc = (uint64_t)((crcmask^(crc24c(A128_flip,8*offset+bitlen)>>8)))&0xffffff;
+ else if (polarParams->crcParityBits == 11)
+ tcrc = (uint64_t)((crcmask^(crc11(A128_flip,bitlen)>>21)))&0x7ff;
}
int n;
// this is number of quadwords in the bit string
- int quadwlen = (polarParams->K>>6);
-
- if ((polarParams->K&63) > 0) quadwlen++;
+ int quadwlen = (polarParams->K+63)/64;
// Create the B bit string as
// 0, 0, ..., 0, a'_0, a'_1, ..., a'_A-1, p_0, p_1, ..., p_{N_parity-1}
//??? b_{N'-1} b_{N'-2} ... b_{N'-A} b_{N'-A-1} ... b_{N'-A-Nparity} = a_{N-1} a_{N-2} ... a_{N-A} p_{N_parity-1} ... p_0
-
- for (n=0; n<quadwlen; n++) if (n==0) B[n] = (A[n] << polarParams->crcParityBits) | tcrc;
- else B[n] = (A[n] << polarParams->crcParityBits) | (A[n-1]>>(64-polarParams->crcParityBits));
+ uint64_t B[4]= {0};
+ B[0] = (A[0] << polarParams->crcParityBits) | tcrc;
+ for (n=1; n<quadwlen; n++)
+ if ((bitlen+63)/64 > n)
+ B[n] = (A[n] << polarParams->crcParityBits) | (A[n-1]>>(64-polarParams->crcParityBits));
+ else
+ B[n] = (A[n-1]>>(64-polarParams->crcParityBits));
uint8_t *Bbyte = (uint8_t *)B;
// for each byte of B, lookup in corresponding table for 64-bit word corresponding to that byte and its position
+ uint64_t Cprime[4]= {0};
if (polarParams->K<65)
Cprime[0] = polarParams->cprime_tab0[0][Bbyte[0]] |
- polarParams->cprime_tab0[1][Bbyte[1]] |
+ polarParams->cprime_tab0[1][Bbyte[1]] |
polarParams->cprime_tab0[2][Bbyte[2]] |
polarParams->cprime_tab0[3][Bbyte[3]] |
polarParams->cprime_tab0[4][Bbyte[4]] |
@@ -684,4 +702,7 @@ void polar_encoder_fast(uint64_t *A,
}
memset((void*)out,0,polarParams->encoderLength>>3);
polar_rate_matching(polarParams,(void *)D, out);
+
+ polarReturn;
+
}
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_matrix_and_array.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_matrix_and_array.c
index c4c68e4e0e4a0a9827cc1c2c49df2bb7f2682de9..ffeacb6be1bd8629bd204a887dcb5ed274a037b3 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_matrix_and_array.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_matrix_and_array.c
@@ -43,163 +43,6 @@ void nr_matrix_multiplication_uint8_1D_uint8_2D(uint8_t *matrix1, uint8_t **matr
}
}
-uint8_t ***nr_alloc_uint8_3D_array(uint16_t xlen, uint16_t ylen, uint16_t zlen) {
- uint8_t ***output;
- int i, j;
-
- if ((output = malloc(xlen * sizeof(*output))) == NULL) {
- perror("[nr_alloc_uint8_3D_array] Problem at 1D allocation");
- return NULL;
- }
- for (i = 0; i < xlen; i++)
- output[i] = NULL;
-
-
- for (i = 0; i < xlen; i++)
- if ((output[i] = malloc(ylen * sizeof *output[i])) == NULL) {
- perror("[nr_alloc_uint8_3D_array] Problem at 2D allocation");
- nr_free_uint8_3D_array(output, xlen, ylen);
- return NULL;
- }
- for (i = 0; i < xlen; i++)
- for (j = 0; j < ylen; j++)
- output[i][j] = NULL;
-
-
- for (i = 0; i < xlen; i++)
- for (j = 0; j < ylen; j++)
- if ((output[i][j] = malloc(zlen * sizeof *output[i][j])) == NULL) {
- perror("[nr_alloc_uint8_3D_array] Problem at 3D allocation");
- nr_free_uint8_3D_array(output, xlen, ylen);
- return NULL;
- }
-
- return output;
-}
-
-uint8_t **nr_alloc_uint8_2D_array(uint16_t xlen, uint16_t ylen) {
- uint8_t **output;
- int i, j;
-
- if ((output = malloc(xlen * sizeof(*output))) == NULL) {
- perror("[nr_alloc_uint8_2D_array] Problem at 1D allocation");
- return NULL;
- }
- for (i = 0; i < xlen; i++)
- output[i] = NULL;
-
-
- for (i = 0; i < xlen; i++)
- if ((output[i] = malloc(ylen * sizeof *output[i])) == NULL) {
- perror("[nr_alloc_uint8_2D_array] Problem at 2D allocation");
- nr_free_uint8_2D_array(output, xlen);
- return NULL;
- }
- for (i = 0; i < xlen; i++)
- for (j = 0; j < ylen; j++)
- output[i][j] = 0;
-
- return output;
-}
-
-double ***nr_alloc_double_3D_array(uint16_t xlen, uint16_t ylen, uint16_t zlen) {
- double ***output;
- int i, j;
-
- if ((output = malloc(xlen * sizeof(*output))) == NULL) {
- perror("[nr_alloc_double_3D_array] Problem at 1D allocation");
- return NULL;
- }
- for (i = 0; i < xlen; i++)
- output[i] = NULL;
-
-
- for (i = 0; i < xlen; i++)
- if ((output[i] = malloc(ylen * sizeof *output[i])) == NULL) {
- perror("[nr_alloc_double_3D_array] Problem at 2D allocation");
- nr_free_double_3D_array(output, xlen, ylen);
- return NULL;
- }
- for (i = 0; i < xlen; i++)
- for (j = 0; j < ylen; j++)
- output[i][j] = NULL;
-
-
- for (i = 0; i < xlen; i++)
- for (j = 0; j < ylen; j++)
- if ((output[i][j] = malloc(zlen * sizeof *output[i][j])) == NULL) {
- perror("[nr_alloc_double_3D_array] Problem at 3D allocation");
- nr_free_double_3D_array(output, xlen, ylen);
- return NULL;
- }
-
- return output;
-}
-
-double **nr_alloc_double_2D_array(uint16_t xlen, uint16_t ylen) {
- double **output;
- int i, j;
-
- if ((output = malloc(xlen * sizeof(*output))) == NULL) {
- perror("[nr_alloc_double_3D_array] Problem at 1D allocation");
- return NULL;
- }
- for (i = 0; i < xlen; i++)
- output[i] = NULL;
-
-
- for (i = 0; i < xlen; i++)
- if ((output[i] = malloc(ylen * sizeof *output[i])) == NULL) {
- perror("[nr_alloc_double_2D_array] Problem at 2D allocation");
- nr_free_double_2D_array(output, xlen);
- return NULL;
- }
- for (i = 0; i < xlen; i++)
- for (j = 0; j < ylen; j++)
- output[i][j] = 0;
-
-
- return output;
-}
-
-void nr_free_double_3D_array(double ***input, uint16_t xlen, uint16_t ylen) {
- int i, j;
-
- for (i = 0; i < xlen; i++) {
- for (j = 0; j < ylen; j++) {
- free(input[i][j]);
- }
- free(input[i]);
- }
- free(input);
-}
-
-void nr_free_double_2D_array(double **input, uint16_t xlen) {
- int i;
-
- for (i = 0; i < xlen; i++) {
- free(input[i]);
- }
- free(input);
-}
-
-void nr_free_uint8_3D_array(uint8_t ***input, uint16_t xlen, uint16_t ylen) {
- int i, j;
-
- for (i = 0; i < xlen; i++) {
- for (j = 0; j < ylen; j++) {
- free(input[i][j]);
- }
- free(input[i]);
- }
- free(input);
-}
-
-void nr_free_uint8_2D_array(uint8_t **input, uint16_t xlen) {
- for (int i = 0; i < xlen; i++) free(input[i]);
- free(input);
-}
-
// Modified Bubble Sort.
void nr_sort_asc_double_1D_array_ind(double *matrix, uint8_t *ind, uint8_t len) {
int swaps;
diff --git a/openair1/PHY/CODING/nr_polar_init.c b/openair1/PHY/CODING/nr_polar_init.c
index f6a700117dd4a4ac9b2b98d2f78ebd1a319dbba1..38a1ae86ae9317d1f6cf0d04f10c7d8b6d9959b7 100644
--- a/openair1/PHY/CODING/nr_polar_init.c
+++ b/openair1/PHY/CODING/nr_polar_init.c
@@ -33,178 +33,236 @@
#include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
#include "PHY/NR_TRANSPORT/nr_dci.h"
+#define PolarKey ((messageType<<24)|(messageLength<<8)|aggregation_level)
+static t_nrPolar_params * PolarList=NULL;
+pthread_mutex_t PolarListMutex=PTHREAD_MUTEX_INITIALIZER;
+
static int intcmp(const void *p1,const void *p2) {
return(*(int16_t *)p1 > *(int16_t *)p2);
}
-static void nr_polar_init(t_nrPolar_params * *polarParams,
- int8_t messageType,
+static void nr_polar_delete_list(t_nrPolar_params * polarParams) {
+ if (!polarParams)
+ return;
+ if (polarParams->nextPtr)
+ nr_polar_delete_list(polarParams->nextPtr);
+
+ delete_decoder_tree(polarParams);
+ //From build_polar_tables()
+ for (int k=0; k < polarParams->K + polarParams->n_pc; k++)
+ if (polarParams->G_N_tab[k])
+ free(polarParams->G_N_tab[k]);
+ free(polarParams->G_N_tab);
+ free(polarParams->rm_tab);
+ if (polarParams->crc_generator_matrix)
+ free(polarParams->crc_generator_matrix);
+ //polar_encoder vectors:
+ free(polarParams->nr_polar_crc);
+ free(polarParams->nr_polar_aPrime);
+ free(polarParams->nr_polar_APrime);
+ free(polarParams->nr_polar_D);
+ free(polarParams->nr_polar_E);
+ //Polar Coding vectors
+ free(polarParams->nr_polar_U);
+ free(polarParams->nr_polar_CPrime);
+ free(polarParams->nr_polar_B);
+ free(polarParams->nr_polar_A);
+ free(polarParams->interleaving_pattern);
+ free(polarParams->deinterleaving_pattern);
+ free(polarParams->rate_matching_pattern);
+ free(polarParams->information_bit_pattern);
+ free(polarParams->Q_I_N);
+ free(polarParams->Q_F_N);
+ free(polarParams->Q_PC_N);
+ free(polarParams->channel_interleaver_pattern);
+ free(polarParams);
+}
+
+static void nr_polar_delete(void) {
+ pthread_mutex_lock(&PolarListMutex);
+ nr_polar_delete_list(PolarList);
+ PolarList=NULL;
+ pthread_mutex_unlock(&PolarListMutex);
+}
+
+t_nrPolar_params * nr_polar_params(int8_t messageType,
uint16_t messageLength,
uint8_t aggregation_level,
int decoder_flag) {
- t_nrPolar_params *currentPtr = *polarParams;
- uint16_t aggregation_prime = (messageType >= 2) ? aggregation_level : nr_polar_aggregation_prime(aggregation_level);
-
+ // The lock is weak, because we never delete in the list, only at exit time
+ // therefore, returning t_nrPolar_params * from the list is safe for future usage
+ pthread_mutex_lock(&PolarListMutex);
+ if(!PolarList)
+ atexit(nr_polar_delete);
+
+ t_nrPolar_params *currentPtr = PolarList;
//Parse the list. If the node is already created, return without initialization.
while (currentPtr != NULL) {
//printf("currentPtr->idx %d, (%d,%d)\n",currentPtr->idx,currentPtr->payloadBits,currentPtr->encoderLength);
//LOG_D(PHY,"Looking for index %d\n",(messageType * messageLength * aggregation_prime));
- if (currentPtr->idx == (messageType * messageLength * aggregation_prime)) return;
- else currentPtr = currentPtr->nextPtr;
+ if (currentPtr->busy == false && currentPtr->idx == PolarKey ) {
+ currentPtr->busy=true;
+ pthread_mutex_unlock(&PolarListMutex);
+ if (decoder_flag && !currentPtr->tree.root)
+ build_decoder_tree(currentPtr);
+ return currentPtr ;
+ }
+ else
+ currentPtr = currentPtr->nextPtr;
}
// printf("currentPtr %p (polarParams %p)\n",currentPtr,polarParams);
//Else, initialize and add node to the end of the linked list.
t_nrPolar_params *newPolarInitNode = calloc(sizeof(t_nrPolar_params),1);
-
- if (newPolarInitNode != NULL) {
- // LOG_D(PHY,"Setting new polarParams index %d, messageType %d, messageLength %d, aggregation_prime %d\n",(messageType * messageLength * aggregation_prime),messageType,messageLength,aggregation_prime);
- newPolarInitNode->idx = (messageType * messageLength * aggregation_prime);
- newPolarInitNode->nextPtr = NULL;
- //printf("newPolarInitNode->idx %d, (%d,%d,%d:%d)\n",newPolarInitNode->idx,messageType,messageLength,aggregation_prime,aggregation_level);
-
- if (messageType == 0) { //PBCH
- newPolarInitNode->n_max = NR_POLAR_PBCH_N_MAX;
- newPolarInitNode->i_il = NR_POLAR_PBCH_I_IL;
- newPolarInitNode->i_seg = NR_POLAR_PBCH_I_SEG;
- newPolarInitNode->n_pc = NR_POLAR_PBCH_N_PC;
- newPolarInitNode->n_pc_wm = NR_POLAR_PBCH_N_PC_WM;
- newPolarInitNode->i_bil = NR_POLAR_PBCH_I_BIL;
- newPolarInitNode->crcParityBits = NR_POLAR_PBCH_CRC_PARITY_BITS;
- newPolarInitNode->payloadBits = NR_POLAR_PBCH_PAYLOAD_BITS;
- newPolarInitNode->encoderLength = NR_POLAR_PBCH_E;
- newPolarInitNode->crcCorrectionBits = NR_POLAR_PBCH_CRC_ERROR_CORRECTION_BITS;
- newPolarInitNode->crc_generator_matrix = crc24c_generator_matrix(newPolarInitNode->payloadBits);//G_P
- //printf("Initializing polar parameters for PBCH (K %d, E %d)\n",newPolarInitNode->payloadBits,newPolarInitNode->encoderLength);
- } else if (messageType == 1) { //DCI
- newPolarInitNode->n_max = NR_POLAR_DCI_N_MAX;
- newPolarInitNode->i_il = NR_POLAR_DCI_I_IL;
- newPolarInitNode->i_seg = NR_POLAR_DCI_I_SEG;
- newPolarInitNode->n_pc = NR_POLAR_DCI_N_PC;
- newPolarInitNode->n_pc_wm = NR_POLAR_DCI_N_PC_WM;
- newPolarInitNode->i_bil = NR_POLAR_DCI_I_BIL;
- newPolarInitNode->crcParityBits = NR_POLAR_DCI_CRC_PARITY_BITS;
- newPolarInitNode->payloadBits = messageLength;
- newPolarInitNode->encoderLength = aggregation_level*108;
- newPolarInitNode->crcCorrectionBits = NR_POLAR_DCI_CRC_ERROR_CORRECTION_BITS;
- newPolarInitNode->crc_generator_matrix=crc24c_generator_matrix(newPolarInitNode->payloadBits+newPolarInitNode->crcParityBits);//G_P
- //printf("Initializing polar parameters for DCI (K %d, E %d, L %d)\n",newPolarInitNode->payloadBits,newPolarInitNode->encoderLength,aggregation_level);
- } else if (messageType == 2) { //UCI PUCCH2
- AssertFatal(aggregation_level>2,"Aggregation level (%d) for PUCCH 2 encoding is NPRB and should be > 2\n",aggregation_level);
- AssertFatal(messageLength>11,"Message length %d is too short for polar encoding of UCI\n",messageLength);
- newPolarInitNode->n_max = NR_POLAR_PUCCH_N_MAX;
- newPolarInitNode->i_il = NR_POLAR_PUCCH_I_IL;
- newPolarInitNode->encoderLength = aggregation_level * 16;
-
- newPolarInitNode->i_seg = 0;
-
- if ((messageLength >= 360 && newPolarInitNode->encoderLength >= 1088)||
- (messageLength >= 1013)) newPolarInitNode->i_seg = 1;
+ newPolarInitNode->busy=true;
+ pthread_mutex_unlock(&PolarListMutex);
- newPolarInitNode->crcParityBits = 11;
- newPolarInitNode->n_pc = 0;
- newPolarInitNode->n_pc_wm = 0;
+ AssertFatal(newPolarInitNode != NULL, "[nr_polar_init] New t_nrPolar_params * could not be created");
+
+ // LOG_D(PHY,"Setting new polarParams index %d, messageType %d, messageLength %d, aggregation_prime %d\n",(messageType * messageLength * aggregation_prime),messageType,messageLength,aggregation_prime);
+ newPolarInitNode->idx = PolarKey;
+ newPolarInitNode->nextPtr = NULL;
+ //printf("newPolarInitNode->idx %d, (%d,%d,%d:%d)\n",newPolarInitNode->idx,messageType,messageLength,aggregation_prime,aggregation_level);
+
+ if (messageType == 0) { //PBCH
+ newPolarInitNode->n_max = NR_POLAR_PBCH_N_MAX;
+ newPolarInitNode->i_il = NR_POLAR_PBCH_I_IL;
+ newPolarInitNode->i_seg = NR_POLAR_PBCH_I_SEG;
+ newPolarInitNode->n_pc = NR_POLAR_PBCH_N_PC;
+ newPolarInitNode->n_pc_wm = NR_POLAR_PBCH_N_PC_WM;
+ newPolarInitNode->i_bil = NR_POLAR_PBCH_I_BIL;
+ newPolarInitNode->crcParityBits = NR_POLAR_PBCH_CRC_PARITY_BITS;
+ newPolarInitNode->payloadBits = NR_POLAR_PBCH_PAYLOAD_BITS;
+ newPolarInitNode->encoderLength = NR_POLAR_PBCH_E;
+ newPolarInitNode->crcCorrectionBits = NR_POLAR_PBCH_CRC_ERROR_CORRECTION_BITS;
+ newPolarInitNode->crc_generator_matrix = crc24c_generator_matrix(newPolarInitNode->payloadBits);//G_P
+ //printf("Initializing polar parameters for PBCH (K %d, E %d)\n",newPolarInitNode->payloadBits,newPolarInitNode->encoderLength);
+ } else if (messageType == 1) { //DCI
+ newPolarInitNode->n_max = NR_POLAR_DCI_N_MAX;
+ newPolarInitNode->i_il = NR_POLAR_DCI_I_IL;
+ newPolarInitNode->i_seg = NR_POLAR_DCI_I_SEG;
+ newPolarInitNode->n_pc = NR_POLAR_DCI_N_PC;
+ newPolarInitNode->n_pc_wm = NR_POLAR_DCI_N_PC_WM;
+ newPolarInitNode->i_bil = NR_POLAR_DCI_I_BIL;
+ newPolarInitNode->crcParityBits = NR_POLAR_DCI_CRC_PARITY_BITS;
+ newPolarInitNode->payloadBits = messageLength;
+ newPolarInitNode->encoderLength = aggregation_level*108;
+ newPolarInitNode->crcCorrectionBits = NR_POLAR_DCI_CRC_ERROR_CORRECTION_BITS;
+ newPolarInitNode->crc_generator_matrix=crc24c_generator_matrix(newPolarInitNode->payloadBits+newPolarInitNode->crcParityBits);//G_P
+ //printf("Initializing polar parameters for DCI (K %d, E %d, L %d)\n",newPolarInitNode->payloadBits,newPolarInitNode->encoderLength,aggregation_level);
+ } else if (messageType == 2) { //UCI PUCCH2
+ AssertFatal(aggregation_level>2,"Aggregation level (%d) for PUCCH 2 encoding is NPRB and should be > 2\n",aggregation_level);
+ AssertFatal(messageLength>11,"Message length %d is too short for polar encoding of UCI\n",messageLength);
+ newPolarInitNode->n_max = NR_POLAR_PUCCH_N_MAX;
+ newPolarInitNode->i_il = NR_POLAR_PUCCH_I_IL;
+ newPolarInitNode->encoderLength = aggregation_level * 16;
- if (messageLength < 20) {
- newPolarInitNode->crcParityBits = 6;
- newPolarInitNode->n_pc = 3;
- if ((newPolarInitNode->encoderLength - messageLength - 6 + 3) < 193) newPolarInitNode->n_pc_wm = 1;
- }
+ newPolarInitNode->i_seg = 0;
+
+ if ((messageLength >= 360 && newPolarInitNode->encoderLength >= 1088)||
+ (messageLength >= 1013)) newPolarInitNode->i_seg = 1;
+ newPolarInitNode->crcParityBits = 11;
+ newPolarInitNode->n_pc = 0;
+ newPolarInitNode->n_pc_wm = 0;
+ if (messageLength < 20) {
+ newPolarInitNode->crcParityBits = 6;
+ newPolarInitNode->n_pc = 3;
+ if ((newPolarInitNode->encoderLength - messageLength - 6 + 3) < 193) newPolarInitNode->n_pc_wm = 1;
+ }
- newPolarInitNode->i_bil = NR_POLAR_PUCCH_I_BIL;
- newPolarInitNode->payloadBits = messageLength;
- newPolarInitNode->crcCorrectionBits = NR_POLAR_PUCCH_CRC_ERROR_CORRECTION_BITS;
- //newPolarInitNode->crc_generator_matrix=crc24c_generator_matrix(newPolarInitNode->payloadBits+newPolarInitNode->crcParityBits);//G_P
- //LOG_D(PHY,"New polar node, encoderLength %d, aggregation_level %d\n",newPolarInitNode->encoderLength,aggregation_level);
- } else {
- AssertFatal(1 == 0, "[nr_polar_init] Incorrect Message Type(%d)", messageType);
- }
- newPolarInitNode->K = newPolarInitNode->payloadBits + newPolarInitNode->crcParityBits; // Number of bits to encode.
- newPolarInitNode->N = nr_polar_output_length(newPolarInitNode->K,
- newPolarInitNode->encoderLength,
- newPolarInitNode->n_max);
- newPolarInitNode->n = log2(newPolarInitNode->N);
- newPolarInitNode->G_N = nr_polar_kronecker_power_matrices(newPolarInitNode->n);
- //polar_encoder vectors:
- newPolarInitNode->nr_polar_crc = malloc(sizeof(uint8_t) * newPolarInitNode->crcParityBits);
- newPolarInitNode->nr_polar_aPrime = malloc(sizeof(uint8_t) * ((ceil((newPolarInitNode->payloadBits)/32.0)*4)+3));
- newPolarInitNode->nr_polar_APrime = malloc(sizeof(uint8_t) * newPolarInitNode->K);
- newPolarInitNode->nr_polar_D = malloc(sizeof(uint8_t) * newPolarInitNode->N);
- newPolarInitNode->nr_polar_E = malloc(sizeof(uint8_t) * newPolarInitNode->encoderLength);
- //Polar Coding vectors
- newPolarInitNode->nr_polar_U = malloc(sizeof(uint8_t) * newPolarInitNode->N); //Decoder: nr_polar_uHat
- newPolarInitNode->nr_polar_CPrime = malloc(sizeof(uint8_t) * newPolarInitNode->K); //Decoder: nr_polar_cHat
- newPolarInitNode->nr_polar_B = malloc(sizeof(uint8_t) * newPolarInitNode->K); //Decoder: nr_polar_bHat
- newPolarInitNode->nr_polar_A = malloc(sizeof(uint8_t) * newPolarInitNode->payloadBits); //Decoder: nr_polar_aHat
- newPolarInitNode->Q_0_Nminus1 = nr_polar_sequence_pattern(newPolarInitNode->n);
- newPolarInitNode->interleaving_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->K);
- nr_polar_interleaving_pattern(newPolarInitNode->K,
- newPolarInitNode->i_il,
- newPolarInitNode->interleaving_pattern);
- newPolarInitNode->deinterleaving_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->K);
-
- for (int i=0; i<newPolarInitNode->K; i++)
- newPolarInitNode->deinterleaving_pattern[newPolarInitNode->interleaving_pattern[i]] = i;
-
- newPolarInitNode->rate_matching_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->encoderLength);
- uint16_t *J = malloc(sizeof(uint16_t) * newPolarInitNode->N);
- nr_polar_rate_matching_pattern(newPolarInitNode->rate_matching_pattern,
- J,
- nr_polar_subblock_interleaver_pattern,
- newPolarInitNode->K,
- newPolarInitNode->N,
- newPolarInitNode->encoderLength);
- newPolarInitNode->information_bit_pattern = malloc(sizeof(uint8_t) * newPolarInitNode->N);
- newPolarInitNode->Q_I_N = malloc(sizeof(int16_t) * (newPolarInitNode->K + newPolarInitNode->n_pc));
- newPolarInitNode->Q_F_N = malloc( sizeof(int16_t) * (newPolarInitNode->N + 1)); // Last element shows the final array index assigned a value.
- newPolarInitNode->Q_PC_N = malloc( sizeof(int16_t) * (newPolarInitNode->n_pc));
-
- for (int i = 0; i <= newPolarInitNode->N; i++)
- newPolarInitNode->Q_F_N[i] = -1; // Empty array.
-
- nr_polar_info_bit_pattern(newPolarInitNode->information_bit_pattern,
- newPolarInitNode->Q_I_N,
- newPolarInitNode->Q_F_N,
- J,
- newPolarInitNode->Q_0_Nminus1,
- newPolarInitNode->K,
- newPolarInitNode->N,
- newPolarInitNode->encoderLength,
- newPolarInitNode->n_pc);
- // sort the Q_I_N array in ascending order (first K positions)
- qsort((void *)newPolarInitNode->Q_I_N,newPolarInitNode->K,sizeof(int16_t),intcmp);
- newPolarInitNode->channel_interleaver_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->encoderLength);
- nr_polar_channel_interleaver_pattern(newPolarInitNode->channel_interleaver_pattern,
- newPolarInitNode->i_bil,
- newPolarInitNode->encoderLength);
- free(J);
- if (decoder_flag == 1) build_decoder_tree(newPolarInitNode);
- build_polar_tables(newPolarInitNode);
- init_polar_deinterleaver_table(newPolarInitNode);
- //printf("decoder tree nodes %d\n",newPolarInitNode->tree.num_nodes);
+ newPolarInitNode->i_bil = NR_POLAR_PUCCH_I_BIL;
+
+ newPolarInitNode->payloadBits = messageLength;
+ newPolarInitNode->crcCorrectionBits = NR_POLAR_PUCCH_CRC_ERROR_CORRECTION_BITS;
+ //newPolarInitNode->crc_generator_matrix=crc24c_generator_matrix(newPolarInitNode->payloadBits+newPolarInitNode->crcParityBits);//G_P
+ //LOG_D(PHY,"New polar node, encoderLength %d, aggregation_level %d\n",newPolarInitNode->encoderLength,aggregation_level);
} else {
- AssertFatal(1 == 0, "[nr_polar_init] New t_nrPolar_params * could not be created");
+ AssertFatal(1 == 0, "[nr_polar_init] Incorrect Message Type(%d)", messageType);
}
- //Fixme: the list is not thread safe
- //The defect is not critical: we always append (never delete items) and adding two times the same is fine
- newPolarInitNode->nextPtr=*polarParams;
- *polarParams=newPolarInitNode;
- return;
+ newPolarInitNode->K = newPolarInitNode->payloadBits + newPolarInitNode->crcParityBits; // Number of bits to encode.
+ newPolarInitNode->N = nr_polar_output_length(newPolarInitNode->K,
+ newPolarInitNode->encoderLength,
+ newPolarInitNode->n_max);
+ newPolarInitNode->n = log2(newPolarInitNode->N);
+ newPolarInitNode->G_N = nr_polar_kronecker_power_matrices(newPolarInitNode->n);
+ //polar_encoder vectors:
+ newPolarInitNode->nr_polar_crc = malloc(sizeof(uint8_t) * newPolarInitNode->crcParityBits);
+ newPolarInitNode->nr_polar_aPrime = malloc(sizeof(uint8_t) * ((ceil((newPolarInitNode->payloadBits)/32.0)*4)+3));
+ newPolarInitNode->nr_polar_APrime = malloc(sizeof(uint8_t) * newPolarInitNode->K);
+ newPolarInitNode->nr_polar_D = malloc(sizeof(uint8_t) * newPolarInitNode->N);
+ newPolarInitNode->nr_polar_E = malloc(sizeof(uint8_t) * newPolarInitNode->encoderLength);
+ //Polar Coding vectors
+ newPolarInitNode->nr_polar_U = malloc(sizeof(uint8_t) * newPolarInitNode->N); //Decoder: nr_polar_uHat
+ newPolarInitNode->nr_polar_CPrime = malloc(sizeof(uint8_t) * newPolarInitNode->K); //Decoder: nr_polar_cHat
+ newPolarInitNode->nr_polar_B = malloc(sizeof(uint8_t) * newPolarInitNode->K); //Decoder: nr_polar_bHat
+ newPolarInitNode->nr_polar_A = malloc(sizeof(uint8_t) * newPolarInitNode->payloadBits); //Decoder: nr_polar_aHat
+ newPolarInitNode->Q_0_Nminus1 = nr_polar_sequence_pattern(newPolarInitNode->n);
+ newPolarInitNode->interleaving_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->K);
+ nr_polar_interleaving_pattern(newPolarInitNode->K,
+ newPolarInitNode->i_il,
+ newPolarInitNode->interleaving_pattern);
+ newPolarInitNode->deinterleaving_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->K);
+
+ for (int i=0; i<newPolarInitNode->K; i++)
+ newPolarInitNode->deinterleaving_pattern[newPolarInitNode->interleaving_pattern[i]] = i;
+
+ newPolarInitNode->rate_matching_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->encoderLength);
+ uint16_t J[newPolarInitNode->N];
+ nr_polar_rate_matching_pattern(newPolarInitNode->rate_matching_pattern,
+ J,
+ nr_polar_subblock_interleaver_pattern,
+ newPolarInitNode->K,
+ newPolarInitNode->N,
+ newPolarInitNode->encoderLength);
+ newPolarInitNode->information_bit_pattern = malloc(sizeof(uint8_t) * newPolarInitNode->N);
+ newPolarInitNode->Q_I_N = malloc(sizeof(int16_t) * (newPolarInitNode->K + newPolarInitNode->n_pc));
+ newPolarInitNode->Q_F_N = malloc( sizeof(int16_t) * (newPolarInitNode->N + 1)); // Last element shows the final array index assigned a value.
+ newPolarInitNode->Q_PC_N = malloc( sizeof(int16_t) * (newPolarInitNode->n_pc));
+
+ for (int i = 0; i <= newPolarInitNode->N; i++)
+ newPolarInitNode->Q_F_N[i] = -1; // Empty array.
+
+ nr_polar_info_bit_pattern(newPolarInitNode->information_bit_pattern,
+ newPolarInitNode->Q_I_N,
+ newPolarInitNode->Q_F_N,
+ J,
+ newPolarInitNode->Q_0_Nminus1,
+ newPolarInitNode->K,
+ newPolarInitNode->N,
+ newPolarInitNode->encoderLength,
+ newPolarInitNode->n_pc);
+ // sort the Q_I_N array in ascending order (first K positions)
+ qsort((void *)newPolarInitNode->Q_I_N,newPolarInitNode->K,sizeof(int16_t),intcmp);
+ newPolarInitNode->channel_interleaver_pattern = malloc(sizeof(uint16_t) * newPolarInitNode->encoderLength);
+ nr_polar_channel_interleaver_pattern(newPolarInitNode->channel_interleaver_pattern,
+ newPolarInitNode->i_bil,
+ newPolarInitNode->encoderLength);
+ if (decoder_flag == 1)
+ build_decoder_tree(newPolarInitNode);
+ build_polar_tables(newPolarInitNode);
+ init_polar_deinterleaver_table(newPolarInitNode);
+ //printf("decoder tree nodes %d\n",newPolarInitNode->tree.num_nodes);
+
+ newPolarInitNode->nextPtr=PolarList;
+ PolarList=newPolarInitNode;
+ return newPolarInitNode;
}
-void nr_polar_print_polarParams(t_nrPolar_params *polarParams) {
+void nr_polar_print_polarParams() {
uint8_t i = 0;
- if (polarParams == NULL) {
+ if (PolarList == NULL) {
printf("polarParams is empty.\n");
} else {
+ t_nrPolar_params * polarParams=PolarList;
while (polarParams != NULL) {
- printf("polarParams[%d] = %d\n", i, polarParams->idx);
+ printf("polarParams[%d] = %d, %d, %d\n", i,
+ polarParams->idx>>24, (polarParams->idx>>8)&0xFFFF, polarParams->idx&0xFF);
polarParams = polarParams->nextPtr;
i++;
}
@@ -213,31 +271,6 @@ void nr_polar_print_polarParams(t_nrPolar_params *polarParams) {
return;
}
-t_nrPolar_params *nr_polar_params (int8_t messageType,
- uint16_t messageLength,
- uint8_t aggregation_level,
- int decoding_flag,
- t_nrPolar_params **polarList_ext) {
- static t_nrPolar_params *polarList = NULL;
- nr_polar_init(polarList_ext != NULL ? polarList_ext : &polarList,
- messageType,messageLength,aggregation_level,decoding_flag);
- t_nrPolar_params *polarParams=polarList_ext != NULL ? *polarList_ext : polarList;
- const int tag=messageType * messageLength * (messageType>=2 ? aggregation_level : nr_polar_aggregation_prime(aggregation_level));
-
-
-
- while (polarParams != NULL) {
- // LOG_D(PHY,"nr_polar_params : tag %d (from nr_polar_init %d)\n",tag,polarParams->idx);
- if (polarParams->idx == tag)
- return polarParams;
-
- polarParams = polarParams->nextPtr;
- }
-
- AssertFatal(false,"Polar Init tables internal failure, no polarParams found\n");
- return NULL;
-}
-
uint16_t nr_polar_aggregation_prime (uint8_t aggregation_level) {
if (aggregation_level == 0) return 0;
else if (aggregation_level == 1) return NR_POLAR_AGGREGATION_LEVEL_1_PRIME;
diff --git a/openair1/PHY/INIT/lte_init.c b/openair1/PHY/INIT/lte_init.c
index 308a059d51417cc760318d98da2419e25ffb99b8..c92d926a8f321f18037392a5659ab60dc9eb605c 100644
--- a/openair1/PHY/INIT/lte_init.c
+++ b/openair1/PHY/INIT/lte_init.c
@@ -415,10 +415,8 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig,
fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset
);
- LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_eNB][MOD %02"PRIu8"][]\n", eNB->Mod_id);
LOG_I (PHY, "[eNB %" PRIu8 "] Initializing DL_FRAME_PARMS : N_RB_DL %" PRIu8 ", PHICH Resource %d, PHICH Duration %d\n",
eNB->Mod_id, fp->N_RB_DL, fp->phich_config_common.phich_resource, fp->phich_config_common.phich_duration);
- LOG_D (PHY, "[MSC_NEW][FRAME 00000][PHY_eNB][MOD %02" PRIu8 "][]\n", eNB->Mod_id);
crcTableInit();
lte_gold (fp, eNB->lte_gold_table, fp->Nid_cell);
generate_pcfich_reg_mapping (fp);
diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index 3bf450703cddc6384adcb2bc91035735f7f7f50d..bf360d347a3dd0227c772a099180fb7d81444b04 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -104,7 +104,6 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
load_dftslib();
- LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_gNB][MOD %02"PRIu8"][]\n", gNB->Mod_id);
crcTableInit();
init_scrambling_luts();
init_pucch2_luts();
@@ -243,37 +242,9 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
common_vars->debugBuff = (int32_t*)malloc16_clear(fp->samples_per_frame*sizeof(int32_t)*100);
common_vars->debugBuff_sample_offset = 0;
-
- // Channel estimates for SRS
-/*
- for (UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
- srs_vars[UE_id].srs_ch_estimates = (int32_t **)malloc16( 64*sizeof(int32_t *) );
- srs_vars[UE_id].srs_ch_estimates_time = (int32_t **)malloc16( 64*sizeof(int32_t *) );
-
- for (i=0; i<64; i++) {
- srs_vars[UE_id].srs_ch_estimates[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size );
- srs_vars[UE_id].srs_ch_estimates_time[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size*2 );
- }
- } //UE_id
-*/
- /*generate_ul_ref_sigs_rx();
-
- init_ulsch_power_LUT();*/
-
-/*
- // SRS
- for (UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
- srs_vars[UE_id].srs = (int32_t *)malloc16_clear(2*fp->ofdm_symbol_size*sizeof(int32_t));
- }
-*/
// PRACH
prach_vars->prachF = (int16_t *)malloc16_clear( 1024*2*sizeof(int16_t) );
prach_vars->rxsigF = (int16_t **)malloc16_clear(Prx*sizeof(int16_t*));
- /*
- for (i=0;i<Prx;i++){
- prach_vars->rxsigF[i] = (int16_t *)malloc16_clear( 1024*2*sizeof(int16_t) );
- }
- */
prach_vars->prach_ifft = (int32_t *)malloc16_clear(1024*2*sizeof(int32_t));
init_prach_list(gNB);
@@ -329,51 +300,102 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
{
NR_DL_FRAME_PARMS* const fp = &gNB->frame_parms;
- NR_gNB_COMMON *const common_vars = &gNB->common_vars;
- NR_gNB_PUSCH **const pusch_vars = gNB->pusch_vars;
- /*LTE_eNB_SRS *const srs_vars = gNB->srs_vars;
- LTE_eNB_PRACH *const prach_vars = &gNB->prach_vars;*/
- uint32_t ***pdcch_dmrs = gNB->nr_gold_pdcch_dmrs;
- int Ptx=gNB->gNB_config.carrier_config.num_tx_ant.value;
+ const int Ptx = gNB->gNB_config.carrier_config.num_tx_ant.value;
+ const int Prx = gNB->gNB_config.carrier_config.num_rx_ant.value;
+ const int max_ul_mimo_layers = 4; // taken from phy_init_nr_gNB()
+ const int n_buf = Prx * max_ul_mimo_layers;
+
+ uint32_t ***pdcch_dmrs = gNB->nr_gold_pdcch_dmrs;
+ for (int slot = 0; slot < fp->slots_per_frame; slot++) {
+ for (int symb = 0; symb < fp->symbols_per_slot; symb++)
+ free_and_zero(pdcch_dmrs[slot][symb]);
+ free_and_zero(pdcch_dmrs[slot]);
+ }
+ free_and_zero(pdcch_dmrs);
+
+ uint32_t ****pdsch_dmrs = gNB->nr_gold_pdsch_dmrs;
+ for (int slot = 0; slot < fp->slots_per_frame; slot++) {
+ for (int symb = 0; symb < fp->symbols_per_slot; symb++) {
+ for (int q = 0; q < NR_MAX_NB_CODEWORDS; q++)
+ free_and_zero(pdsch_dmrs[slot][symb][q]);
+ free_and_zero(pdsch_dmrs[slot][symb]);
+ }
+ free_and_zero(pdsch_dmrs[slot]);
+ }
+ free_and_zero(gNB->nr_gold_pdsch_dmrs);
+ uint32_t ****pusch_dmrs = gNB->nr_gold_pusch_dmrs;
+ for(int nscid = 0; nscid < 2; nscid++) {
+ for (int slot = 0; slot < fp->slots_per_frame; slot++) {
+ for (int symb = 0; symb < fp->symbols_per_slot; symb++)
+ free_and_zero(pusch_dmrs[nscid][slot][symb]);
+ free_and_zero(pusch_dmrs[nscid][slot]);
+ }
+ free_and_zero(pusch_dmrs[nscid]);
+ }
+ free_and_zero(pusch_dmrs);
+
+ uint32_t ***csi_rs = gNB->nr_gold_csi_rs;
+ for (int slot = 0; slot < fp->slots_per_frame; slot++) {
+ for (int symb = 0; symb < fp->symbols_per_slot; symb++)
+ free_and_zero(csi_rs[slot][symb]);
+ free_and_zero(csi_rs[slot]);
+ }
+ free_and_zero(csi_rs);
+
+ for (int id = 0; id < NUMBER_OF_NR_SRS_MAX; id++) {
+ for (int i = 0; i < Prx; i++){
+ free_and_zero(gNB->nr_srs_info[id]->srs_received_signal[i]);
+ free_and_zero(gNB->nr_srs_info[id]->srs_ls_estimated_channel[i]);
+ free_and_zero(gNB->nr_srs_info[id]->srs_estimated_channel_freq[i]);
+ free_and_zero(gNB->nr_srs_info[id]->srs_estimated_channel_time[i]);
+ free_and_zero(gNB->nr_srs_info[id]->srs_estimated_channel_time_shifted[i]);
+ }
+ free_and_zero(gNB->nr_srs_info[id]->srs_generated_signal);
+ free_and_zero(gNB->nr_srs_info[id]->noise_power);
+ free_and_zero(gNB->nr_srs_info[id]->srs_received_signal);
+ free_and_zero(gNB->nr_srs_info[id]->srs_ls_estimated_channel);
+ free_and_zero(gNB->nr_srs_info[id]->srs_estimated_channel_freq);
+ free_and_zero(gNB->nr_srs_info[id]->srs_estimated_channel_time);
+ free_and_zero(gNB->nr_srs_info[id]->srs_estimated_channel_time_shifted);
+ free_and_zero(gNB->nr_srs_info[id]);
+ }
+
+ free_ul_reference_signal_sequences();
+ free_gnb_lowpapr_sequences();
+
+ reset_nr_transport(gNB);
+
+ NR_gNB_COMMON * common_vars = &gNB->common_vars;
for (int i = 0; i < Ptx; i++) {
free_and_zero(common_vars->txdataF[i]);
- /* rxdataF[i] is not allocated -> don't free */
+ free_and_zero(common_vars->beam_id[i]);
+ }
+
+ for (int i = 0; i < Prx; ++i) {
+ free_and_zero(common_vars->rxdataF[i]);
+ free_and_zero(common_vars->rxdata[i]);
}
free_and_zero(common_vars->txdataF);
+ free_and_zero(common_vars->rxdata);
free_and_zero(common_vars->rxdataF);
- // PDCCH DMRS sequences
- free_and_zero(pdcch_dmrs);
-/*
- // Channel estimates for SRS
- for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
- for (i=0; i<64; i++) {
- free_and_zero(srs_vars[UE_id].srs_ch_estimates[i]);
- free_and_zero(srs_vars[UE_id].srs_ch_estimates_time[i]);
- }
-
- free_and_zero(srs_vars[UE_id].srs_ch_estimates);
- free_and_zero(srs_vars[UE_id].srs_ch_estimates_time);
- } //UE_id
+ free_and_zero(common_vars->beam_id);
- //free_ul_ref_sigs();
-
- for (UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) free_and_zero(srs_vars[UE_id].srs);
+ free_and_zero(common_vars->debugBuff);
+ NR_gNB_PRACH* prach_vars = &gNB->prach_vars;
free_and_zero(prach_vars->prachF);
+ free_and_zero(prach_vars->rxsigF);
+ free_and_zero(prach_vars->prach_ifft);
- for (i = 0; i < 64; i++) free_and_zero(prach_vars->prach_ifft[0][i]);
-
- free_and_zero(prach_vars->prach_ifft[0]);
- free_and_zero(prach_vars->rxsigF[0]);
-*/
+ NR_gNB_PUSCH** pusch_vars = gNB->pusch_vars;
for (int ULSCH_id=0; ULSCH_id<gNB->number_of_nr_ulsch_max; ULSCH_id++) {
- for (int i = 0; i < fp->nb_antennas_rx; i++) {
+ for (int i = 0; i < Prx; i++) {
free_and_zero(pusch_vars[ULSCH_id]->rxdataF_ext[i]);
free_and_zero(pusch_vars[ULSCH_id]->rxdataF_ext2[i]);
}
- for (int i = 0; i < 4*fp->nb_antennas_rx; i++) {
+ for (int i = 0; i < n_buf; i++) {
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_estimates[i]);
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_estimates_ext[i]);
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_estimates_time[i]);
@@ -393,8 +415,8 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_estimates_ext);
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_ptrs_estimates);
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_ptrs_estimates_ext);
- free_and_zero(pusch_vars[ULSCH_id]->ul_ch_estimates_time);
free_and_zero(pusch_vars[ULSCH_id]->ptrs_phase_per_slot);
+ free_and_zero(pusch_vars[ULSCH_id]->ul_ch_estimates_time);
free_and_zero(pusch_vars[ULSCH_id]->ul_valid_re_per_slot);
free_and_zero(pusch_vars[ULSCH_id]->rxdataF_comp);
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_mag0);
@@ -406,14 +428,6 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
free_and_zero(pusch_vars[ULSCH_id]->llr);
free_and_zero(pusch_vars[ULSCH_id]);
} //ULSCH_id
-/*
- for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) gNB->UE_stats_ptr[UE_id] = NULL;
-*/
-
-
- free_gnb_lowpapr_sequences();
-
-
}
//Adding nr_schedule_handler
@@ -554,6 +568,16 @@ void init_DLSCH_struct(PHY_VARS_gNB *gNB, processingData_L1tx_t *msg) {
}
}
+void reset_DLSCH_struct(const PHY_VARS_gNB *gNB, processingData_L1tx_t *msg)
+{
+ const NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
+ const nfapi_nr_config_request_scf_t *cfg = &gNB->gNB_config;
+ const uint16_t grid_size = cfg->carrier_config.dl_grid_size[fp->numerology_index].value;
+ for (int i=0; i<gNB->number_of_nr_dlsch_max; i++)
+ for (int j=0; j<2; j++)
+ free_gNB_dlsch(&msg->dlsch[i][j], grid_size);
+}
+
void init_nr_transport(PHY_VARS_gNB *gNB) {
NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
LOG_I(PHY, "Initialise nr transport\n");
@@ -578,7 +602,7 @@ void init_nr_transport(PHY_VARS_gNB *gNB) {
for (int j=0; j<2; j++) {
// ULSCH for data
- gNB->ulsch[i][j] = new_gNB_ulsch(MAX_LDPC_ITERATIONS, fp->N_RB_UL, 0);
+ gNB->ulsch[i][j] = new_gNB_ulsch(MAX_LDPC_ITERATIONS, fp->N_RB_UL);
if (!gNB->ulsch[i][j]) {
LOG_E(PHY,"Can't get gNB ulsch structures\n");
@@ -594,3 +618,18 @@ void init_nr_transport(PHY_VARS_gNB *gNB) {
//fp->pucch_config_common.deltaPUCCH_Shift = 1;
}
+
+void reset_nr_transport(PHY_VARS_gNB *gNB)
+{
+ const NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
+
+ for (int i = 0; i < NUMBER_OF_NR_PUCCH_MAX; i++)
+ free_gNB_pucch(gNB->pucch[i]);
+
+ for (int i = 0; i < NUMBER_OF_NR_SRS_MAX; i++)
+ free_gNB_srs(gNB->srs[i]);
+
+ for (int i=0; i<gNB->number_of_nr_ulsch_max; i++)
+ for (int j=0; j<2; j++)
+ free_gNB_ulsch(&gNB->ulsch[i][j], fp->N_RB_UL);
+}
diff --git a/openair1/PHY/INIT/nr_init_ru.c b/openair1/PHY/INIT/nr_init_ru.c
index d032746718b215e190288af832a6815677cc074e..07f1d3b9e3c4578dd9495bfea3b6213b22e5b51d 100644
--- a/openair1/PHY/INIT/nr_init_ru.c
+++ b/openair1/PHY/INIT/nr_init_ru.c
@@ -174,17 +174,13 @@ void nr_phy_free_RU(RU_t *ru)
LOG_I(PHY, "Feeing RU signal buffers (if_south %s) nb_tx %d\n", ru_if_types[ru->if_south], ru->nb_tx);
- free_and_zero(ru->nr_frame_parms);
- free_and_zero(ru->frame_parms);
-
if (ru->if_south <= REMOTE_IF5) { // this means REMOTE_IF5 or LOCAL_RF, so free memory for time-domain signals
- int32_t *ptr;
- for (i = 0; i < ru->nb_tx; i++) {
- ptr=&ru->common.txdata[i][-ru->sf_extension];
- free_and_zero(ptr);
- }
- for (i = 0; i < ru->nb_rx; i++) free_and_zero(ru->common.rxdata[i]);
+ for (i = 0; i < ru->nb_tx; i++)
+ free_and_zero(ru->common.txdata[i]);
free_and_zero(ru->common.txdata);
+
+ for (i = 0; i < ru->nb_rx; i++)
+ free_and_zero(ru->common.rxdata[i]);
free_and_zero(ru->common.rxdata);
} // else: IF5 or local RF -> nothing to free()
@@ -193,7 +189,7 @@ void nr_phy_free_RU(RU_t *ru)
free_and_zero(ru->common.rxdata_7_5kHz);
// free beamforming input buffers (TX)
- for (i = 0; i < 15; i++) free_and_zero(ru->common.txdataF[i]);
+ for (i = 0; i < ru->nb_tx; i++) free_and_zero(ru->common.txdataF[i]);
free_and_zero(ru->common.txdataF);
// free IFFT input buffers (TX)
@@ -205,15 +201,21 @@ void nr_phy_free_RU(RU_t *ru)
free_and_zero(ru->common.rxdataF);
for (j=0;j<NUMBER_OF_NR_RU_PRACH_OCCASIONS_MAX;j++) {
- for (i = 0; i < ru->nb_rx; i++) {
+ for (i = 0; i < ru->nb_rx; i++)
free_and_zero(ru->prach_rxsigF[j][i]);
- }
+ free_and_zero(ru->prach_rxsigF[j]);
}
- for (i = 0; i < ru->num_gNB; i++) {
- for (p = 0; p < 15; p++) {
- for (j=0; j<ru->nb_tx; j++) free_and_zero(ru->beam_weights[i][p][j]);
- free_and_zero(ru->beam_weights[i][p]);
+
+ if (ru->do_precoding == 1) {
+ for (i = 0; i < ru->num_gNB; i++) {
+ for (p = 0; p < ru->nb_log_antennas; p++) {
+ for (j=0; j<ru->nb_tx; j++) free_and_zero(ru->beam_weights[i][p][j]);
+ free_and_zero(ru->beam_weights[i][p]);
+ }
}
+ for(i=0; i< ru->nb_tx; ++i)
+ free_and_zero(ru->common.beam_id[i]);
+ free_and_zero(ru->common.beam_id);
}
}
free_and_zero(ru->common.sync_corr);
diff --git a/openair1/PHY/INIT/nr_init_ue.c b/openair1/PHY/INIT/nr_init_ue.c
index b571afe41631da5a307b3e31cce8fd5067cef195..a27c541c80e86d674f2e0b3b8138cf940cc94fa0 100644
--- a/openair1/PHY/INIT/nr_init_ue.c
+++ b/openair1/PHY/INIT/nr_init_ue.c
@@ -111,6 +111,49 @@ void phy_init_nr_ue__PDSCH(NR_UE_PDSCH *const pdsch,
}
}
+void phy_term_nr_ue__PDSCH(NR_UE_PDSCH* pdsch, const NR_DL_FRAME_PARMS *const fp)
+{
+ for (int i = 0; i < fp->nb_antennas_rx; i++) {
+ for (int j = 0; j < NR_MAX_NB_LAYERS; j++) {
+ const int idx = j * fp->nb_antennas_rx + i;
+ for (int k = 0; k < NR_MAX_NB_LAYERS; k++)
+ free_and_zero(pdsch->rho[i][j*NR_MAX_NB_LAYERS+k]);
+ free_and_zero(pdsch->rxdataF_comp0[idx]);
+ free_and_zero(pdsch->dl_ch_estimates[idx]);
+ free_and_zero(pdsch->dl_ch_estimates_ext[idx]);
+ free_and_zero(pdsch->dl_bf_ch_estimates[idx]);
+ free_and_zero(pdsch->dl_bf_ch_estimates_ext[idx]);
+ free_and_zero(pdsch->dl_ch_mag0[idx]);
+ free_and_zero(pdsch->dl_ch_magb0[idx]);
+ free_and_zero(pdsch->dl_ch_magr0[idx]);
+ }
+ free_and_zero(pdsch->rxdataF_ext[i]);
+ free_and_zero(pdsch->rxdataF_uespec_pilots[i]);
+ free_and_zero(pdsch->ptrs_phase_per_slot[i]);
+ free_and_zero(pdsch->ptrs_re_per_slot[i]);
+ free_and_zero(pdsch->dl_ch_ptrs_estimates_ext[i]);
+ free_and_zero(pdsch->rho[i]);
+ }
+ free_and_zero(pdsch->pmi_ext);
+ free_and_zero(pdsch->llr[0]);
+ free_and_zero(pdsch->layer_llr[0]);
+ free_and_zero(pdsch->llr128);
+ free_and_zero(pdsch->rxdataF_ext);
+ free_and_zero(pdsch->rxdataF_uespec_pilots);
+ free_and_zero(pdsch->rxdataF_comp0);
+ free_and_zero(pdsch->rho);
+ free_and_zero(pdsch->dl_ch_estimates);
+ free_and_zero(pdsch->dl_ch_estimates_ext);
+ free_and_zero(pdsch->dl_bf_ch_estimates);
+ free_and_zero(pdsch->dl_bf_ch_estimates_ext);
+ free_and_zero(pdsch->dl_ch_mag0);
+ free_and_zero(pdsch->dl_ch_magb0);
+ free_and_zero(pdsch->dl_ch_magr0);
+ free_and_zero(pdsch->ptrs_phase_per_slot);
+ free_and_zero(pdsch->ptrs_re_per_slot);
+ free_and_zero(pdsch->dl_ch_ptrs_estimates_ext);
+}
+
void phy_init_nr_ue_PUSCH(NR_UE_PUSCH *const pusch,
const NR_DL_FRAME_PARMS *const fp) {
AssertFatal( pusch, "pusch==0" );
@@ -120,9 +163,14 @@ void phy_init_nr_ue_PUSCH(NR_UE_PUSCH *const pusch,
}
}
-int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
- int nb_connected_gNB,
- uint8_t abstraction_flag) {
+void phy_term_nr_ue_PUSCH(NR_UE_PUSCH *pusch)
+{
+ for (int i = 0; i < NR_MAX_NB_LAYERS; i++)
+ free_and_zero(pusch->txdataF_layers[i]);
+}
+
+int init_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
+{
// create shortcuts
NR_DL_FRAME_PARMS *const fp = &ue->frame_parms;
NR_UE_COMMON *const common_vars = &ue->common_vars;
@@ -134,11 +182,7 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
int gNB_id;
int th_id;
uint32_t ****pusch_dmrs;
- uint16_t N_n_scid[2] = {0,1}; // [HOTFIX] This is a temporary implementation of scramblingID0 and scramblingID1 which are given by DMRS-UplinkConfig
- int n_scid;
- abstraction_flag = 0;
- LOG_I(PHY, "Initializing UE vars (abstraction %u) for gNB TXant %u, UE RXant %u\n", abstraction_flag, fp->nb_antennas_tx, fp->nb_antennas_rx);
- //LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_UE][MOD %02u][]\n", ue->Mod_id+NB_gNB_INST);
+ LOG_I(PHY, "Initializing UE vars for gNB TXant %u, UE RXant %u\n", fp->nb_antennas_tx, fp->nb_antennas_rx);
phy_init_nr_top(ue);
// many memory allocation sizes are hard coded
AssertFatal( fp->nb_antennas_rx <= 4, "hard coded allocation for ue_common_vars->dl_ch_estimates[gNB_id]" );
@@ -192,7 +236,6 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
///////////
ue->nr_gold_pusch_dmrs = (uint32_t ****)malloc16(fp->slots_per_frame*sizeof(uint32_t ***));
pusch_dmrs = ue->nr_gold_pusch_dmrs;
- n_scid = 0; // This quantity is indicated by higher layer parameter dmrs-SeqInitialization
for (slot=0; slot<fp->slots_per_frame; slot++) {
pusch_dmrs[slot] = (uint32_t ***)malloc16(fp->symbols_per_slot*sizeof(uint32_t **));
@@ -209,7 +252,6 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
}
}
- nr_init_pusch_dmrs(ue, N_n_scid, n_scid);
///////////
////////////////////////////////////////////////////////////////////////////////////////////
@@ -231,29 +273,27 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
for (i=0; i<10; i++)
ue->tx_power_dBm[i]=-127;
- if (abstraction_flag == 0) {
- // init TX buffers
- common_vars->txdata = (int32_t **)malloc16( fp->nb_antennas_tx*sizeof(int32_t *) );
- common_vars->txdataF = (int32_t **)malloc16( fp->nb_antennas_tx*sizeof(int32_t *) );
+ // init TX buffers
+ common_vars->txdata = (int32_t **)malloc16( fp->nb_antennas_tx*sizeof(int32_t *) );
+ common_vars->txdataF = (int32_t **)malloc16( fp->nb_antennas_tx*sizeof(int32_t *) );
- for (i=0; i<fp->nb_antennas_tx; i++) {
- common_vars->txdata[i] = (int32_t *)malloc16_clear( fp->samples_per_subframe*10*sizeof(int32_t) );
- common_vars->txdataF[i] = (int32_t *)malloc16_clear( fp->samples_per_slot_wCP*sizeof(int32_t) );
- }
+ for (i=0; i<fp->nb_antennas_tx; i++) {
+ common_vars->txdata[i] = (int32_t *)malloc16_clear( fp->samples_per_subframe*10*sizeof(int32_t) );
+ common_vars->txdataF[i] = (int32_t *)malloc16_clear( fp->samples_per_slot_wCP*sizeof(int32_t) );
+ }
- // init RX buffers
- common_vars->rxdata = (int32_t **)malloc16( fp->nb_antennas_rx*sizeof(int32_t *) );
+ // init RX buffers
+ common_vars->rxdata = (int32_t **)malloc16( fp->nb_antennas_rx*sizeof(int32_t *) );
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- common_vars->common_vars_rx_data_per_thread[th_id].rxdataF = (int32_t **)malloc16( fp->nb_antennas_rx*sizeof(int32_t *) );
- }
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ common_vars->common_vars_rx_data_per_thread[th_id].rxdataF = (int32_t **)malloc16( fp->nb_antennas_rx*sizeof(int32_t *) );
+ }
- for (i=0; i<fp->nb_antennas_rx; i++) {
- common_vars->rxdata[i] = (int32_t *) malloc16_clear( (2*(fp->samples_per_frame)+2048)*sizeof(int32_t) );
+ for (i=0; i<fp->nb_antennas_rx; i++) {
+ common_vars->rxdata[i] = (int32_t *) malloc16_clear( (2*(fp->samples_per_frame)+2048)*sizeof(int32_t) );
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- common_vars->common_vars_rx_data_per_thread[th_id].rxdataF[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*(fp->samples_per_slot_wCP) );
- }
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ common_vars->common_vars_rx_data_per_thread[th_id].rxdataF[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*(fp->samples_per_slot_wCP) );
}
}
@@ -272,9 +312,6 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
}
}
- ue->scramblingID_pdcch = fp->Nid_cell;
- nr_gold_pdcch(ue,fp->Nid_cell);
-
//PDSCH DMRS init (eNB offset = 0)
ue->nr_gold_pdsch[0] = (uint32_t ****)malloc16(fp->slots_per_frame*sizeof(uint32_t ***));
uint32_t ****pdsch_dmrs = ue->nr_gold_pdsch[0];
@@ -294,12 +331,6 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
}
}
- // initializing the scrambling IDs for PDSCH DMRS
- for (int i=0; i<2; i++)
- ue->scramblingID[i]=fp->Nid_cell;
-
- nr_gold_pdsch(ue,ue->scramblingID);
-
// DLSCH
for (gNB_id = 0; gNB_id < ue->n_connected_gNB; gNB_id++) {
for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
@@ -331,129 +362,119 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
ue->nr_srs_info->srs_estimated_channel_time_shifted[i] = (int32_t *) malloc16_clear(fp->ofdm_symbol_size*MAX_NUM_NR_SRS_SYMBOLS*sizeof(int32_t));
}
- if (abstraction_flag == 0) {
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- phy_init_nr_ue__PDSCH( ue->pdsch_vars[th_id][gNB_id], fp );
- }
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ phy_init_nr_ue__PDSCH( ue->pdsch_vars[th_id][gNB_id], fp );
+ }
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- ue->pdsch_vars[th_id][gNB_id]->llr_shifts = (uint8_t *)malloc16_clear(7*2*fp->N_RB_DL*12);
- ue->pdsch_vars[th_id][gNB_id]->llr_shifts_p = ue->pdsch_vars[0][gNB_id]->llr_shifts;
- ue->pdsch_vars[th_id][gNB_id]->llr[1] = (int16_t *)malloc16_clear( (8*(3*8*8448))*sizeof(int16_t) );
- ue->pdsch_vars[th_id][gNB_id]->layer_llr[1] = (int16_t *)malloc16_clear( (8*(3*8*8448))*sizeof(int16_t) );
- ue->pdsch_vars[th_id][gNB_id]->llr128_2ndstream = (int16_t **)malloc16_clear( sizeof(int16_t *) );
- }
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ ue->pdsch_vars[th_id][gNB_id]->llr_shifts = (uint8_t *)malloc16_clear(7*2*fp->N_RB_DL*12);
+ ue->pdsch_vars[th_id][gNB_id]->llr_shifts_p = ue->pdsch_vars[0][gNB_id]->llr_shifts;
+ ue->pdsch_vars[th_id][gNB_id]->llr[1] = (int16_t *)malloc16_clear( (8*(3*8*8448))*sizeof(int16_t) );
+ ue->pdsch_vars[th_id][gNB_id]->layer_llr[1] = (int16_t *)malloc16_clear( (8*(3*8*8448))*sizeof(int16_t) );
+ ue->pdsch_vars[th_id][gNB_id]->llr128_2ndstream = (int16_t **)malloc16_clear( sizeof(int16_t *) );
+ }
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- ue->pdsch_vars[th_id][gNB_id]->dl_ch_rho2_ext = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- }
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ ue->pdsch_vars[th_id][gNB_id]->dl_ch_rho2_ext = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ }
- for (i=0; i<fp->nb_antennas_rx; i++)
- for (j=0; j<4; j++) {
- const int idx = (j*fp->nb_antennas_rx)+i;
- const size_t num = 7*2*fp->N_RB_DL*12+4;
+ for (i=0; i<fp->nb_antennas_rx; i++)
+ for (j=0; j<4; j++) {
+ const int idx = (j*fp->nb_antennas_rx)+i;
+ const size_t num = 7*2*fp->N_RB_DL*12+4;
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- ue->pdsch_vars[th_id][gNB_id]->dl_ch_rho2_ext[idx] = (int32_t *)malloc16_clear( sizeof(int32_t) * num );
- }
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ ue->pdsch_vars[th_id][gNB_id]->dl_ch_rho2_ext[idx] = (int32_t *)malloc16_clear( sizeof(int32_t) * num );
}
+ }
- //const size_t num = 7*2*fp->N_RB_DL*12+4;
- for (k=0; k<8; k++) { //harq_pid
- for (l=0; l<8; l++) { //round
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- ue->pdsch_vars[th_id][gNB_id]->rxdataF_comp1[k][l] = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- ue->pdsch_vars[th_id][gNB_id]->dl_ch_rho_ext[k][l] = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- ue->pdsch_vars[th_id][gNB_id]->dl_ch_mag1[k][l] = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- ue->pdsch_vars[th_id][gNB_id]->dl_ch_magb1[k][l] = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- }
+ //const size_t num = 7*2*fp->N_RB_DL*12+4;
+ for (k=0; k<8; k++) { //harq_pid
+ for (l=0; l<8; l++) { //round
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ ue->pdsch_vars[th_id][gNB_id]->rxdataF_comp1[k][l] = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ ue->pdsch_vars[th_id][gNB_id]->dl_ch_rho_ext[k][l] = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ ue->pdsch_vars[th_id][gNB_id]->dl_ch_mag1[k][l] = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ ue->pdsch_vars[th_id][gNB_id]->dl_ch_magb1[k][l] = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ }
- for (int i=0; i<fp->nb_antennas_rx; i++)
- for (int j=0; j<4; j++) { //frame_parms->nb_antennas_tx; j++)
- const int idx = (j*fp->nb_antennas_rx)+i;
+ for (int i=0; i<fp->nb_antennas_rx; i++)
+ for (int j=0; j<4; j++) { //frame_parms->nb_antennas_tx; j++)
+ const int idx = (j*fp->nb_antennas_rx)+i;
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- ue->pdsch_vars[th_id][gNB_id]->dl_ch_rho_ext[k][l][idx] = (int32_t *)malloc16_clear(7*2*sizeof(int32_t)*(fp->N_RB_DL*12));
- ue->pdsch_vars[th_id][gNB_id]->rxdataF_comp1[k][l][idx] = (int32_t *)malloc16_clear(7*2*sizeof(int32_t)*(fp->N_RB_DL*12));
- ue->pdsch_vars[th_id][gNB_id]->dl_ch_mag1[k][l][idx] = (int32_t *)malloc16_clear(7*2*sizeof(int32_t)*(fp->N_RB_DL*12));
- ue->pdsch_vars[th_id][gNB_id]->dl_ch_magb1[k][l][idx] = (int32_t *)malloc16_clear(7*2*sizeof(int32_t)*(fp->N_RB_DL*12));
- }
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ ue->pdsch_vars[th_id][gNB_id]->dl_ch_rho_ext[k][l][idx] = (int32_t *)malloc16_clear(7*2*sizeof(int32_t)*(fp->N_RB_DL*12));
+ ue->pdsch_vars[th_id][gNB_id]->rxdataF_comp1[k][l][idx] = (int32_t *)malloc16_clear(7*2*sizeof(int32_t)*(fp->N_RB_DL*12));
+ ue->pdsch_vars[th_id][gNB_id]->dl_ch_mag1[k][l][idx] = (int32_t *)malloc16_clear(7*2*sizeof(int32_t)*(fp->N_RB_DL*12));
+ ue->pdsch_vars[th_id][gNB_id]->dl_ch_magb1[k][l][idx] = (int32_t *)malloc16_clear(7*2*sizeof(int32_t)*(fp->N_RB_DL*12));
}
- }
- }
-
- // 100 PRBs * 12 REs/PRB * 4 PDCCH SYMBOLS * 2 LLRs/RE
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- ue->pdcch_vars[th_id][gNB_id]->llr = (int16_t *)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
- ue->pdcch_vars[th_id][gNB_id]->llr16 = (int16_t *)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
- ue->pdcch_vars[th_id][gNB_id]->wbar = (int16_t *)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
- ue->pdcch_vars[th_id][gNB_id]->e_rx = (int16_t *)malloc16_clear( 4*2*100*12 );
- ue->pdcch_vars[th_id][gNB_id]->rxdataF_comp = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- ue->pdcch_vars[th_id][gNB_id]->dl_ch_rho_ext = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- ue->pdcch_vars[th_id][gNB_id]->rho = (int32_t **)malloc16( fp->nb_antennas_rx*sizeof(int32_t *) );
- ue->pdcch_vars[th_id][gNB_id]->rxdataF_ext = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates_ext = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- // Channel estimates
- ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates = (int32_t **)malloc16_clear(4*fp->nb_antennas_rx*sizeof(int32_t *));
- ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates_time = (int32_t **)malloc16_clear(4*fp->nb_antennas_rx*sizeof(int32_t *));
-
- for (i=0; i<fp->nb_antennas_rx; i++) {
- ue->pdcch_vars[th_id][gNB_id]->rho[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*(100*12*4));
-
- for (j=0; j<4; j++) {
- int idx = (j*fp->nb_antennas_rx)+i;
- ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates[idx] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->symbols_per_slot*(fp->ofdm_symbol_size+LTE_CE_FILTER_LENGTH) );
- ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates_time[idx] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size*2 );
- // size_t num = 7*2*fp->N_RB_DL*12;
- size_t num = 4*273*12; // 4 symbols, 100 PRBs, 12 REs per PRB
- ue->pdcch_vars[th_id][gNB_id]->rxdataF_comp[idx] = (int32_t *)malloc16_clear(sizeof(int32_t) * num);
- ue->pdcch_vars[th_id][gNB_id]->dl_ch_rho_ext[idx] = (int32_t *)malloc16_clear(sizeof(int32_t) * num);
- ue->pdcch_vars[th_id][gNB_id]->rxdataF_ext[idx] = (int32_t *)malloc16_clear(sizeof(int32_t) * num);
- ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates_ext[idx] = (int32_t *)malloc16_clear(sizeof(int32_t) * num);
}
- }
}
+ }
- // PBCH
- pbch_vars[gNB_id]->rxdataF_ext = (int32_t **)malloc16( fp->nb_antennas_rx*sizeof(int32_t *) );
- pbch_vars[gNB_id]->rxdataF_comp = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- pbch_vars[gNB_id]->dl_ch_estimates = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- pbch_vars[gNB_id]->dl_ch_estimates_ext = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- pbch_vars[gNB_id]->dl_ch_estimates_time = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
- pbch_vars[gNB_id]->llr = (int16_t *)malloc16_clear( 1920 ); //
- prach_vars[gNB_id]->prachF = (int16_t *)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
- prach_vars[gNB_id]->prach = (int16_t *)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
+ // 100 PRBs * 12 REs/PRB * 4 PDCCH SYMBOLS * 2 LLRs/RE
+ for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
+ ue->pdcch_vars[th_id][gNB_id]->llr = (int16_t *)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ ue->pdcch_vars[th_id][gNB_id]->llr16 = (int16_t *)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ ue->pdcch_vars[th_id][gNB_id]->wbar = (int16_t *)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ ue->pdcch_vars[th_id][gNB_id]->e_rx = (int16_t *)malloc16_clear( 4*2*100*12 );
+ ue->pdcch_vars[th_id][gNB_id]->rxdataF_comp = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ ue->pdcch_vars[th_id][gNB_id]->dl_ch_rho_ext = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ ue->pdcch_vars[th_id][gNB_id]->rho = (int32_t **)malloc16( fp->nb_antennas_rx*sizeof(int32_t *) );
+ ue->pdcch_vars[th_id][gNB_id]->rxdataF_ext = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates_ext = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ // Channel estimates
+ ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates = (int32_t **)malloc16_clear(4*fp->nb_antennas_rx*sizeof(int32_t *));
+ ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates_time = (int32_t **)malloc16_clear(4*fp->nb_antennas_rx*sizeof(int32_t *));
for (i=0; i<fp->nb_antennas_rx; i++) {
- pbch_vars[gNB_id]->rxdataF_ext[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*20*12*4 );
+ ue->pdcch_vars[th_id][gNB_id]->rho[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*(100*12*4));
- for (j=0; j<4; j++) {//fp->nb_antennas_tx;j++) {
+ for (j=0; j<4; j++) {
int idx = (j*fp->nb_antennas_rx)+i;
- pbch_vars[gNB_id]->rxdataF_comp[idx] = (int32_t *)malloc16_clear( sizeof(int32_t)*20*12*4 );
- pbch_vars[gNB_id]->dl_ch_estimates[idx] = (int32_t *)malloc16_clear( sizeof(int32_t)*7*2*sizeof(int)*(fp->ofdm_symbol_size) );
- pbch_vars[gNB_id]->dl_ch_estimates_time[idx]= (int32_t *)malloc16_clear( sizeof(int32_t)*7*2*sizeof(int)*(fp->ofdm_symbol_size) );
- pbch_vars[gNB_id]->dl_ch_estimates_ext[idx] = (int32_t *)malloc16_clear( sizeof(int32_t)*20*12*4 );
+ ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates[idx] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->symbols_per_slot*(fp->ofdm_symbol_size+LTE_CE_FILTER_LENGTH) );
+ ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates_time[idx] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size*2 );
+ // size_t num = 7*2*fp->N_RB_DL*12;
+ size_t num = 4*273*12; // 4 symbols, 100 PRBs, 12 REs per PRB
+ ue->pdcch_vars[th_id][gNB_id]->rxdataF_comp[idx] = (int32_t *)malloc16_clear(sizeof(int32_t) * num);
+ ue->pdcch_vars[th_id][gNB_id]->dl_ch_rho_ext[idx] = (int32_t *)malloc16_clear(sizeof(int32_t) * num);
+ ue->pdcch_vars[th_id][gNB_id]->rxdataF_ext[idx] = (int32_t *)malloc16_clear(sizeof(int32_t) * num);
+ ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates_ext[idx] = (int32_t *)malloc16_clear(sizeof(int32_t) * num);
}
}
}
+ // PBCH
+ pbch_vars[gNB_id]->rxdataF_ext = (int32_t **)malloc16( fp->nb_antennas_rx*sizeof(int32_t *) );
+ pbch_vars[gNB_id]->rxdataF_comp = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ pbch_vars[gNB_id]->dl_ch_estimates = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ pbch_vars[gNB_id]->dl_ch_estimates_ext = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ pbch_vars[gNB_id]->dl_ch_estimates_time = (int32_t **)malloc16_clear( 4*fp->nb_antennas_rx*sizeof(int32_t *) );
+ pbch_vars[gNB_id]->llr = (int16_t *)malloc16_clear( 1920 ); //
+ prach_vars[gNB_id]->prachF = (int16_t *)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
+ prach_vars[gNB_id]->prach = (int16_t *)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
+
+ for (i=0; i<fp->nb_antennas_rx; i++) {
+ pbch_vars[gNB_id]->rxdataF_ext[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*20*12*4 );
+
+ for (j=0; j<4; j++) {//fp->nb_antennas_tx;j++) {
+ int idx = (j*fp->nb_antennas_rx)+i;
+ pbch_vars[gNB_id]->rxdataF_comp[idx] = (int32_t *)malloc16_clear( sizeof(int32_t)*20*12*4 );
+ pbch_vars[gNB_id]->dl_ch_estimates[idx] = (int32_t *)malloc16_clear( sizeof(int32_t)*7*2*sizeof(int)*(fp->ofdm_symbol_size) );
+ pbch_vars[gNB_id]->dl_ch_estimates_time[idx]= (int32_t *)malloc16_clear( sizeof(int32_t)*7*2*sizeof(int)*(fp->ofdm_symbol_size) );
+ pbch_vars[gNB_id]->dl_ch_estimates_ext[idx] = (int32_t *)malloc16_clear( sizeof(int32_t)*20*12*4 );
+ }
+ }
+
pbch_vars[gNB_id]->decoded_output = (uint8_t *)malloc16_clear(64);
}
// initialization for the last instance of pdsch_vars (used for MU-MIMO)
for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- ue->pdsch_vars[th_id][gNB_id] = (NR_UE_PDSCH *)malloc16_clear(sizeof(NR_UE_PDSCH));
- }
-
- if (abstraction_flag == 0) {
- for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
- //phy_init_lte_ue__PDSCH( ue->pdsch_vars[th_id][gNB_id], fp );
- ue->pdsch_vars[th_id][gNB_id]->llr[1] = (int16_t *)malloc16_clear((8*(3*8*8448))*sizeof(int16_t));
- ue->pdsch_vars[th_id][gNB_id]->layer_llr[1] = (int16_t *)malloc16_clear((8*(3*8*8448))*sizeof(int16_t));
- }
- } else { //abstraction == 1
- ue->sinr_dB = (double *) malloc16_clear( fp->N_RB_DL*12*sizeof(double) );
+ ue->pdsch_vars[th_id][gNB_id] = malloc16_clear(sizeof(NR_UE_PDSCH));
+ ue->pdsch_vars[th_id][gNB_id]->llr[1] = malloc16_clear((8*(3*8*8448))*sizeof(int16_t));
+ ue->pdsch_vars[th_id][gNB_id]->layer_llr[1] = malloc16_clear((8*(3*8*8448))*sizeof(int16_t));
}
ue->sinr_CQI_dB = (double *) malloc16_clear( fp->N_RB_DL*12*sizeof(double) );
@@ -474,25 +495,224 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
return 0;
}
-void init_nr_ue_transport(PHY_VARS_NR_UE *ue,
- int abstraction_flag) {
+void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
+{
+ const NR_DL_FRAME_PARMS* fp = &ue->frame_parms;
+ phy_term_nr_top();
+
+ for (int th_id = 0; th_id < RX_NB_TH_MAX; th_id++) {
+ for (int gNB_id = 0; gNB_id < ue->n_connected_gNB; gNB_id++) {
+ phy_term_nr_ue_PUSCH(ue->pusch_vars[th_id][gNB_id]);
+ free_and_zero(ue->pusch_vars[th_id][gNB_id]);
+ free_and_zero(ue->pucch_vars[th_id][gNB_id]);
+ }
+ }
+
+ for (int slot = 0; slot < fp->slots_per_frame; slot++) {
+ for (int symb = 0; symb < fp->symbols_per_slot; symb++) {
+ for (int q = 0; q < NR_MAX_NB_CODEWORDS; q++)
+ free_and_zero(ue->nr_gold_pusch_dmrs[slot][symb][q]);
+ free_and_zero(ue->nr_gold_pusch_dmrs[slot][symb]);
+ }
+ free_and_zero(ue->nr_gold_pusch_dmrs[slot]);
+ }
+ free_and_zero(ue->nr_gold_pusch_dmrs);
+
+ NR_UE_COMMON* common_vars = &ue->common_vars;
+
+ for (int i = 0; i < fp->nb_antennas_tx; i++) {
+ free_and_zero(common_vars->txdata[i]);
+ free_and_zero(common_vars->txdataF[i]);
+ }
+
+ free_and_zero(common_vars->txdata);
+ free_and_zero(common_vars->txdataF);
+
+ for (int i = 0; i < fp->nb_antennas_rx; i++) {
+ free_and_zero(common_vars->rxdata[i]);
+ for (int th_id = 0; th_id < RX_NB_TH_MAX; th_id++)
+ free_and_zero(common_vars->common_vars_rx_data_per_thread[th_id].rxdataF[i]);
+ }
+ for (int th_id = 0; th_id < RX_NB_TH_MAX; th_id++) {
+ free_and_zero(common_vars->common_vars_rx_data_per_thread[th_id].rxdataF);
+ }
+ free_and_zero(common_vars->rxdata);
+
+ for (int slot = 0; slot < fp->slots_per_frame; slot++) {
+ for (int symb = 0; symb < fp->symbols_per_slot; symb++)
+ free_and_zero(ue->nr_gold_pdcch[0][slot][symb]);
+ free_and_zero(ue->nr_gold_pdcch[0][slot]);
+ }
+ free_and_zero(ue->nr_gold_pdcch[0]);
+
+ for (int slot=0; slot<fp->slots_per_frame; slot++) {
+ for (int symb=0; symb<fp->symbols_per_slot; symb++) {
+ for (int q=0; q<NR_MAX_NB_CODEWORDS; q++)
+ free_and_zero(ue->nr_gold_pdsch[0][slot][symb][q]);
+ free_and_zero(ue->nr_gold_pdsch[0][slot][symb]);
+ }
+ free_and_zero(ue->nr_gold_pdsch[0][slot]);
+ }
+ free_and_zero(ue->nr_gold_pdsch[0]);
+
+ for (int gNB_id = 0; gNB_id < ue->n_connected_gNB; gNB_id++) {
+
+ // PDSCH
+ for (int th_id = 0; th_id < RX_NB_TH_MAX; th_id++) {
+ for (int k = 0; k < 8; k++) { //harq_pid
+ for (int l = 0; l < 8; l++) { //round
+ for (int i = 0; i < fp->nb_antennas_rx; i++) {
+ for (int j = 0; j < 4; j++) { //frame_parms->nb_antennas_tx; j++)
+ const int idx = j * fp->nb_antennas_rx + i;
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->dl_ch_rho_ext[k][l][idx]);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->rxdataF_comp1[k][l][idx]);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->dl_ch_mag1[k][l][idx]);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->dl_ch_magb1[k][l][idx]);
+ }
+ }
+
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->rxdataF_comp1[k][l]);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->dl_ch_rho_ext[k][l]);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->dl_ch_mag1[k][l]);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->dl_ch_magb1[k][l]);
+ }
+ }
+
+ for (int i = 0; i < fp->nb_antennas_rx; i++) {
+ for (int j = 0; j < 4; j++) {
+ const int idx = (j*fp->nb_antennas_rx)+i;
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->dl_ch_rho2_ext[idx]);
+ }
+ }
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->llr_shifts);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->llr[1]);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->layer_llr[1]);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->llr128_2ndstream);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->dl_ch_rho2_ext);
+
+ phy_term_nr_ue__PDSCH(ue->pdsch_vars[th_id][gNB_id], fp);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]);
+ }
+
+ for (int th_id = 0; th_id < RX_NB_TH_MAX; th_id++) {
+ for (int i = 0; i < fp->nb_antennas_rx; i++) {
+ for (int j = 0; j < 4; j++) {
+ int idx = j * fp->nb_antennas_rx + i;
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates[idx]);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates_time[idx]);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->rxdataF_comp[idx]);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->dl_ch_rho_ext[idx]);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->rxdataF_ext[idx]);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates_ext[idx]);
+ }
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->rho[i]);
+ }
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->llr);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->llr16);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->wbar);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->e_rx);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->rxdataF_comp);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->dl_ch_rho_ext);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->rho);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->rxdataF_ext);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates_ext);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates);
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]->dl_ch_estimates_time);
+
+ free_and_zero(ue->pdcch_vars[th_id][gNB_id]);
+ }
+
+ for (int i = 0; i < fp->nb_antennas_rx; i++) {
+ free_and_zero(ue->nr_srs_info->srs_received_signal[i]);
+ free_and_zero(ue->nr_srs_info->srs_ls_estimated_channel[i]);
+ free_and_zero(ue->nr_srs_info->srs_estimated_channel_freq[i]);
+ free_and_zero(ue->nr_srs_info->srs_estimated_channel_time[i]);
+ free_and_zero(ue->nr_srs_info->srs_estimated_channel_time_shifted[i]);
+ }
+ free_and_zero(ue->nr_srs_info->srs_generated_signal);
+ free_and_zero(ue->nr_srs_info->noise_power);
+ free_and_zero(ue->nr_srs_info->srs_received_signal);
+ free_and_zero(ue->nr_srs_info->srs_ls_estimated_channel);
+ free_and_zero(ue->nr_srs_info->srs_estimated_channel_freq);
+ free_and_zero(ue->nr_srs_info->srs_estimated_channel_time);
+ free_and_zero(ue->nr_srs_info->srs_estimated_channel_time_shifted);
+ free_and_zero(ue->nr_srs_info);
+
+ free_and_zero(ue->srs_vars[gNB_id]);
+
+ for (int i = 0; i < fp->nb_antennas_rx; i++) {
+ free_and_zero(ue->pbch_vars[gNB_id]->rxdataF_ext[i]);
+
+ for (int j = 0; j < 4; j++) {
+ int idx = (j*fp->nb_antennas_rx)+i;
+ free_and_zero(ue->pbch_vars[gNB_id]->rxdataF_comp[idx]);
+ free_and_zero(ue->pbch_vars[gNB_id]->dl_ch_estimates[idx]);
+ free_and_zero(ue->pbch_vars[gNB_id]->dl_ch_estimates_time[idx]);
+ free_and_zero(ue->pbch_vars[gNB_id]->dl_ch_estimates_ext[idx]);
+ }
+ }
+
+ free_and_zero(ue->pbch_vars[gNB_id]->rxdataF_ext);
+ free_and_zero(ue->pbch_vars[gNB_id]->rxdataF_comp);
+ free_and_zero(ue->pbch_vars[gNB_id]->dl_ch_estimates);
+ free_and_zero(ue->pbch_vars[gNB_id]->dl_ch_estimates_ext);
+ free_and_zero(ue->pbch_vars[gNB_id]->dl_ch_estimates_time);
+ free_and_zero(ue->pbch_vars[gNB_id]->llr);
+ free_and_zero(ue->pbch_vars[gNB_id]->decoded_output);
+ free_and_zero(ue->pbch_vars[gNB_id]);
+
+ free_and_zero(ue->prach_vars[gNB_id]->prachF);
+ free_and_zero(ue->prach_vars[gNB_id]->prach);
+ free_and_zero(ue->prach_vars[gNB_id]);
+ }
+
+ const int gNB_id = ue->n_connected_gNB;
+ for (int th_id = 0; th_id < RX_NB_TH_MAX; th_id++) {
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->llr[1]);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]->layer_llr[1]);
+ free_and_zero(ue->pdsch_vars[th_id][gNB_id]);
+ }
+
+ free_and_zero(ue->sinr_CQI_dB);
+}
+
+void term_nr_ue_transport(PHY_VARS_NR_UE *ue)
+{
+ const int N_RB_DL = ue->frame_parms.N_RB_DL;
+ for (int i = 0; i < NUMBER_OF_CONNECTED_gNB_MAX; i++) {
+ for (int j = 0; j < 2; j++) {
+ for (int k = 0; k < RX_NB_TH_MAX; k++) {
+ free_nr_ue_dlsch(&ue->dlsch[k][i][j], N_RB_DL);
+ free_nr_ue_ulsch(&ue->ulsch[k][i][j], N_RB_DL);
+ }
+ }
+
+ free_nr_ue_dlsch(&ue->dlsch_SI[i], N_RB_DL);
+ free_nr_ue_dlsch(&ue->dlsch_ra[i], N_RB_DL);
+ }
+
+ free_nr_ue_dlsch(&ue->dlsch_MCH[0], N_RB_DL);
+}
+
+void init_nr_ue_transport(PHY_VARS_NR_UE *ue)
+{
for (int i = 0; i < NUMBER_OF_CONNECTED_gNB_MAX; i++) {
for (int j=0; j<2; j++) {
for (int k=0; k<RX_NB_TH_MAX; k++) {
- AssertFatal((ue->dlsch[k][i][j] = new_nr_ue_dlsch(1,NR_MAX_DLSCH_HARQ_PROCESSES,NSOFT,MAX_LDPC_ITERATIONS,ue->frame_parms.N_RB_DL, abstraction_flag))!=NULL,"Can't get ue dlsch structures\n");
+ AssertFatal((ue->dlsch[k][i][j] = new_nr_ue_dlsch(1,NR_MAX_DLSCH_HARQ_PROCESSES,NSOFT,MAX_LDPC_ITERATIONS,ue->frame_parms.N_RB_DL))!=NULL,"Can't get ue dlsch structures\n");
LOG_D(PHY,"dlsch[%d][%d][%d] => %p\n",k,i,j,ue->dlsch[k][i][j]);
- AssertFatal((ue->ulsch[k][i][j] = new_nr_ue_ulsch(ue->frame_parms.N_RB_UL, NR_MAX_ULSCH_HARQ_PROCESSES, abstraction_flag))!=NULL,"Can't get ue ulsch structures\n");
+ AssertFatal((ue->ulsch[k][i][j] = new_nr_ue_ulsch(ue->frame_parms.N_RB_UL, NR_MAX_ULSCH_HARQ_PROCESSES))!=NULL,"Can't get ue ulsch structures\n");
LOG_D(PHY,"ulsch[%d][%d][%d] => %p\n",k,i,j,ue->ulsch[k][i][j]);
}
}
- ue->dlsch_SI[i] = new_nr_ue_dlsch(1,1,NSOFT,MAX_LDPC_ITERATIONS,ue->frame_parms.N_RB_DL, abstraction_flag);
- ue->dlsch_ra[i] = new_nr_ue_dlsch(1,1,NSOFT,MAX_LDPC_ITERATIONS,ue->frame_parms.N_RB_DL, abstraction_flag);
+ ue->dlsch_SI[i] = new_nr_ue_dlsch(1,1,NSOFT,MAX_LDPC_ITERATIONS,ue->frame_parms.N_RB_DL);
+ ue->dlsch_ra[i] = new_nr_ue_dlsch(1,1,NSOFT,MAX_LDPC_ITERATIONS,ue->frame_parms.N_RB_DL);
ue->transmission_mode[i] = ue->frame_parms.nb_antenna_ports_gNB==1 ? 1 : 2;
}
//ue->frame_parms.pucch_config_common.deltaPUCCH_Shift = 1;
- ue->dlsch_MCH[0] = new_nr_ue_dlsch(1,NR_MAX_DLSCH_HARQ_PROCESSES,NSOFT,MAX_LDPC_ITERATIONS_MBSFN,ue->frame_parms.N_RB_DL,0);
+ ue->dlsch_MCH[0] = new_nr_ue_dlsch(1,NR_MAX_DLSCH_HARQ_PROCESSES,NSOFT,MAX_LDPC_ITERATIONS_MBSFN,ue->frame_parms.N_RB_DL);
for(int i=0; i<5; i++)
ue->dl_stats[i] = 0;
@@ -556,3 +776,9 @@ void phy_init_nr_top(PHY_VARS_NR_UE *ue) {
//init_unscrambling_lut();
//set_taus_seed(1328);
}
+
+void phy_term_nr_top(void)
+{
+ free_ul_reference_signal_sequences();
+ free_context_synchro_nr();
+}
diff --git a/openair1/PHY/INIT/phy_init.h b/openair1/PHY/INIT/phy_init.h
index dd9232de83ac744a38bf835cea367c8fec8d454b..8648dd7d82c70fe4fae0592b1a7636818a54a3cb 100644
--- a/openair1/PHY/INIT/phy_init.h
+++ b/openair1/PHY/INIT/phy_init.h
@@ -57,6 +57,7 @@ int l1_north_init_eNB(void);
int phy_init_top(LTE_DL_FRAME_PARMS *frame_parms);
void phy_init_nr_top(PHY_VARS_NR_UE *ue);
+void phy_term_nr_top(void);
/*!
@@ -395,8 +396,9 @@ int nr_get_ssb_start_symbol(NR_DL_FRAME_PARMS *fp,uint8_t i_ssb);
int nr_init_frame_parms(nfapi_nr_config_request_scf_t *config, NR_DL_FRAME_PARMS *frame_parms);
int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *frame_parms, fapi_nr_config_request_t *config, uint16_t nr_band);
void nr_init_frame_parms_ue_sa(NR_DL_FRAME_PARMS *frame_parms, uint64_t downlink_frequency, int32_t uplink_frequency_offset, uint8_t mu, uint16_t nr_band);
-int init_nr_ue_signal(PHY_VARS_NR_UE *ue,int nb_connected_eNB,uint8_t abstraction_flag);
-void init_nr_ue_transport(PHY_VARS_NR_UE *ue,int abstraction_flag);
+int init_nr_ue_signal(PHY_VARS_NR_UE *ue,int nb_connected_eNB);
+void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB);
+void init_nr_ue_transport(PHY_VARS_NR_UE *ue);
void init_N_TA_offset(PHY_VARS_NR_UE *ue);
void nr_dump_frame_parms(NR_DL_FRAME_PARMS *frame_parms);
int phy_init_nr_gNB(PHY_VARS_gNB *gNB, unsigned char is_secondary_gNB, unsigned char lowmem_flag);
@@ -405,11 +407,13 @@ void nr_phy_config_request_sim(PHY_VARS_gNB *gNB,int N_RB_DL,int N_RB_UL,int mu,
void phy_free_nr_gNB(PHY_VARS_gNB *gNB);
int l1_north_init_gNB(void);
void init_nr_transport(PHY_VARS_gNB *gNB);
+void reset_nr_transport(PHY_VARS_gNB *gNB);
void init_dfts(void);
void fill_subframe_mask(PHY_VARS_eNB *eNB);
void init_DLSCH_struct(PHY_VARS_gNB *gNB, processingData_L1tx_t *msg);
+void reset_DLSCH_struct(const PHY_VARS_gNB *gNB, processingData_L1tx_t *msg);
/** @} */
#endif
diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
index ae8c666d18e659d3050f13a8396ac4afff0cadd1..fceff580a3499c3ef8af43b413dffd938b4db027 100644
--- a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
@@ -601,7 +601,8 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *eNB,
G = G - Q_RI - Q_CQI;
ulsch_harq->G = G;
AssertFatal((int)G > 0,
- "FATAL: ulsch_decoding.c G < 0 (%u) : Q_RI %u, Q_CQI %u\n",G,Q_RI,Q_CQI);
+ "FATAL: ulsch_decoding.c G < 0 (%u) : Q_RI %u, Q_CQI %u, nb_rb %u, Q_m %u, ulsch_harq->Nsymb_pusch %u, Qprime %u\n",
+ G, Q_RI, Q_CQI, nb_rb, Q_m, ulsch_harq->Nsymb_pusch, Qprime);
H = G + Q_CQI;
Hprime = H/Q_m;
// Demultiplexing/Deinterleaving of PUSCH/ACK/RI/CQI
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c b/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
index a7054a44d2474df6d6d36297853fc8f0ffb3a9ea..0b665737a7beb1ae27427d07a98a558a82874ed6 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
@@ -6481,7 +6481,7 @@ void dump_dlsch2(PHY_VARS_UE *ue,uint8_t eNB_id,uint8_t subframe,unsigned int *c
sprintf(fname,"dlsch%d_rxF_r%d_uespec0.m",eNB_id,round);
sprintf(vname,"dl%d_rxF_r%d_uespec0",eNB_id,round);
LOG_M(fname,vname,ue->pdsch_vars[ue->current_thread_id[subframe]][eNB_id]->rxdataF_uespec_pilots[0],
- 12*(ue->frame_parms.N_RB_DL)*NSYMB,1,1);
+ 12*(ue->frame_parms.N_RB_DL),1,1);
/*
LOG_M("dlsch%d_ch_ext01.m","dl01_ch0_ext",pdsch_vars[eNB_id]->dl_ch_estimates_ext[1],12*N_RB_DL*NSYMB,1,1);
LOG_M("dlsch%d_ch_ext10.m","dl10_ch0_ext",pdsch_vars[eNB_id]->dl_ch_estimates_ext[2],12*N_RB_DL*NSYMB,1,1);
diff --git a/openair1/PHY/NR_REFSIG/ss_pbch_nr.h b/openair1/PHY/NR_REFSIG/ss_pbch_nr.h
index 52a9c41ae95c8b113ffa58677f1f7810bbc323b9..44f8549258cf11ff7a4a8ef3310653f92697d609 100644
--- a/openair1/PHY/NR_REFSIG/ss_pbch_nr.h
+++ b/openair1/PHY/NR_REFSIG/ss_pbch_nr.h
@@ -65,6 +65,7 @@
/* SS/PBCH parameters */
#define N_RB_SS_PBCH_BLOCK (20)
#define NB_SYMBOLS_PBCH (3)
+#define NR_N_SYMBOLS_SSB (4)
#define IQ_SIZE (sizeof(int16_t) * 2) /* I and Q are alternatively stored into buffers */
#define N_SYMB_SLOT (14)
diff --git a/openair1/PHY/NR_REFSIG/sss_nr.h b/openair1/PHY/NR_REFSIG/sss_nr.h
index 12d91ed3d1cd88ab030ae1d9fea88e59dd712862..03610ae30fb5adc597906d7f39e8ab8a27ad4b3c 100644
--- a/openair1/PHY/NR_REFSIG/sss_nr.h
+++ b/openair1/PHY/NR_REFSIG/sss_nr.h
@@ -63,18 +63,22 @@
/************** VARIABLES *****************************************/
-#define PHASE_HYPOTHESIS_NUMBER (7)
+#define PHASE_HYPOTHESIS_NUMBER (16)
#define INDEX_NO_PHASE_DIFFERENCE (3) /* this is for no phase shift case */
EXTERN const int16_t phase_re_nr[PHASE_HYPOTHESIS_NUMBER]
#ifdef INIT_VARIABLES_SSS_NR_H
-= {16383, 25101, 30791, 32767, 30791, 25101, 16383}
+// -pi/3 ---- pi/3
+= {16384,20173,23571,26509,28932,30791,32051,32687,32687,32051,30791,
+ 28932,26509,23571,20173,16384}
#endif
;
EXTERN const int16_t phase_im_nr[PHASE_HYPOTHESIS_NUMBER]
#ifdef INIT_VARIABLES_SSS_NR_H
-= {-28378, -21063, -11208, 0, 11207, 21062, 28377};
+// -pi/3 ---- pi/3
+= {-28377,-25821,-22762,-19260,-15383,-11207,-6813,-2286,2286,6813,11207,
+ 15383,19260,22762,25821,28377}
#endif
;
@@ -92,7 +96,7 @@ int pss_ch_est_nr(PHY_VARS_NR_UE *ue,
int32_t pss_ext[NB_ANTENNAS_RX][LENGTH_PSS_NR],
int32_t sss_ext[NB_ANTENNAS_RX][LENGTH_SSS_NR]);
-int rx_sss_nr(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int32_t *tot_metric, uint8_t *phase_max);
+int rx_sss_nr(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int32_t *tot_metric, uint8_t *phase_max, int *freq_offset_sss);
#undef INIT_VARIABLES_SSS_NR_H
#undef EXTERN
diff --git a/openair1/PHY/NR_REFSIG/ul_ref_seq_nr.c b/openair1/PHY/NR_REFSIG/ul_ref_seq_nr.c
index 4a419ae926dd3f71e4b2503dc912c84a3c9473bf..c3c4c7a2ee52473ca086243873f21ae0ef677acc 100644
--- a/openair1/PHY/NR_REFSIG/ul_ref_seq_nr.c
+++ b/openair1/PHY/NR_REFSIG/ul_ref_seq_nr.c
@@ -122,23 +122,20 @@ int16_t *base_sequence_less_than_36(unsigned int M_ZC,
*********************************************************************/
int16_t get_index_for_dmrs_lowpapr_seq(int16_t num_dmrs_res) {
-
- int16_t index = -1;
-
- if (num_dmrs_res >= dmrs_ul_allocated_res[(MAX_INDEX_DMRS_UL_ALLOCATED_REs-1)])
+
+ int16_t index = num_dmrs_res/6 - 1;
+
+ if (index >= MAX_INDEX_DMRS_UL_ALLOCATED_REs)
index = MAX_INDEX_DMRS_UL_ALLOCATED_REs-1;
- else
- index = (num_dmrs_res/6) -1;
for (;index >= 0; index--) {
if (dmrs_ul_allocated_res[index] == num_dmrs_res)
break;
-
}
- LOG_D(PHY, "num_dmrs_res: %d INDEX RETURNED: %d", num_dmrs_res, index);
- return index;
+ LOG_D(PHY, "num_dmrs_res: %d INDEX RETURNED: %d", num_dmrs_res, index);
+ return index;
}
/*******************************************************************
@@ -204,6 +201,11 @@ int16_t *base_sequence_36_or_larger(unsigned int Msc_RS,
void generate_lowpapr_typ1_refsig_sequences(unsigned int scaling)
{
+ /* prevent multiple calls, relevant when both UE & gNB initialize this */
+ static bool already_called = false;
+ if (already_called) return;
+ already_called = true;
+
unsigned int u,Msc_RS;
unsigned int v = 0; // sequence hopping and group hopping are not supported yet
@@ -223,6 +225,11 @@ void generate_lowpapr_typ1_refsig_sequences(unsigned int scaling)
void generate_ul_reference_signal_sequences(unsigned int scaling)
{
+ /* prevent multiple calls, relevant when both UE & gNB initialize this */
+ static bool already_called = false;
+ if (already_called) return;
+ already_called = true;
+
unsigned int u,v,Msc_RS;
#if 0
@@ -295,10 +302,10 @@ void free_ul_reference_signal_sequences(void)
for (u=0; u < U_GROUP_NUMBER; u++) {
for (v=0; v < V_BASE_SEQUENCE_NUMBER; v++) {
if (rv_ul_ref_sig[u][v][Msc_RS])
- free16(rv_ul_ref_sig[u][v][Msc_RS],2*sizeof(int16_t)*ul_allocated_re[Msc_RS]);
+ free_and_zero(rv_ul_ref_sig[u][v][Msc_RS]);
if ((v==0) && (Msc_RS < MAX_INDEX_DMRS_UL_ALLOCATED_REs))
if (dmrs_lowpaprtype1_ul_ref_sig[u][v][Msc_RS])
- free16(dmrs_lowpaprtype1_ul_ref_sig[u][v][Msc_RS],2*sizeof(int16_t)*dmrs_ul_allocated_res[Msc_RS]);
+ free_and_zero(dmrs_lowpaprtype1_ul_ref_sig[u][v][Msc_RS]);
}
}
}
@@ -321,7 +328,7 @@ void free_gnb_lowpapr_sequences(void)
v=0;
for (u=0; u < U_GROUP_NUMBER; u++) {
if (gNB_dmrs_lowpaprtype1_sequence[u][v][Msc_RS])
- free16(gNB_dmrs_lowpaprtype1_sequence[u][v][Msc_RS],2*sizeof(int16_t)*dmrs_ul_allocated_res[Msc_RS]);
+ free_and_zero(gNB_dmrs_lowpaprtype1_sequence[u][v][Msc_RS]);
}
}
}
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci.c b/openair1/PHY/NR_TRANSPORT/nr_dci.c
index 7206bd20654ece77f2b1207d7ac53f8930811caa..c4daad36519f19c74fe7d33344a7224452a10de3 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dci.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci.c
@@ -133,11 +133,8 @@ void nr_generate_dci(nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15,
uint16_t Nid = dci_pdu->ScramblingId;
uint16_t scrambling_RNTI = dci_pdu->ScramblingRNTI;
- t_nrPolar_params *currentPtr = nr_polar_params(NR_POLAR_DCI_MESSAGE_TYPE,
- dci_pdu->PayloadSizeBits,
- dci_pdu->AggregationLevel,
- 0,NULL);
- polar_encoder_fast((uint64_t*)dci_pdu->Payload, (void*)encoder_output, n_RNTI,1,currentPtr);
+ polar_encoder_fast((uint64_t*)dci_pdu->Payload, (void*)encoder_output, n_RNTI, 1,
+ NR_POLAR_DCI_MESSAGE_TYPE, dci_pdu->PayloadSizeBits, dci_pdu->AggregationLevel);
#ifdef DEBUG_CHANNEL_CODING
printf("polar rnti %x,length %d, L %d\n",n_RNTI, dci_pdu->PayloadSizeBits,pdcch_pdu_rel15->dci_pdu->AggregationLevel);
printf("DCI PDU: [0]->0x%lx \t [1]->0x%lx\n",
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
index 12a861b71e3f02ae96742fb4e839a2ae636f4a0f..89ba28b0c3120d04cbd29d346f38fedfc17434f3 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
@@ -227,10 +227,10 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
start_sc, rel15->StartSymbolIndex, rel15->rbSize, nb_re,rel15->nrOfLayers);
#endif
- for (int ap=0; ap<rel15->nrOfLayers; ap++) {
start_meas(&gNB->dlsch_resource_mapping_stats);
+ for (int nl=0; nl<rel15->nrOfLayers; nl++) {
- int dmrs_port = get_dmrs_port(ap,rel15->dmrsPorts);
+ int dmrs_port = get_dmrs_port(nl,rel15->dmrsPorts);
// DMRS params for this dmrs port
get_Wt(Wt, dmrs_port, dmrs_Type);
get_Wf(Wf, dmrs_port, dmrs_Type);
@@ -242,7 +242,7 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
#ifdef DEBUG_DLSCH_MAPPING
uint8_t dmrs_symbol = l0+l_prime;
printf("DMRS Type %d params for ap %d: Wt %d %d \t Wf %d %d \t delta %d \t l_prime %d \t l0 %d\tDMRS symbol %d\n",
- 1+dmrs_Type,ap, Wt[0], Wt[1], Wf[0], Wf[1], delta, l_prime, l0, dmrs_symbol);
+ 1+dmrs_Type,nl, Wt[0], Wt[1], Wf[0], Wf[1], delta, l_prime, l0, dmrs_symbol);
#endif
uint16_t m=0, dmrs_idx=0;
@@ -311,7 +311,7 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
if (ptrs_symbol)
is_ptrs_re = is_ptrs_subcarrier(k,
rel15->rnti,
- ap,
+ nl,
rel15->dmrsConfigType,
rel15->PTRSFreqDensity,
rel15->rbSize,
@@ -321,12 +321,12 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
/* Map DMRS Symbol */
if ( (dmrs_symbol_map & (1 << l)) &&
(k == ((start_sc+get_dmrs_freq_idx(n, k_prime, delta, dmrs_Type))%(frame_parms->ofdm_symbol_size)))) {
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = (Wt[l_prime]*Wf[k_prime]*amp*mod_dmrs[dmrs_idx<<1]) >> 15;
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 ] = (Wt[l_prime]*Wf[k_prime]*amp*mod_dmrs[(dmrs_idx<<1) + 1]) >> 15;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = (Wt[l_prime]*Wf[k_prime]*amp*mod_dmrs[dmrs_idx<<1]) >> 15;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 ] = (Wt[l_prime]*Wf[k_prime]*amp*mod_dmrs[(dmrs_idx<<1) + 1]) >> 15;
#ifdef DEBUG_DLSCH_MAPPING
printf("dmrs_idx %d\t l %d \t k %d \t k_prime %d \t n %d \t txdataF: %d %d\n",
- dmrs_idx, l, k, k_prime, n, txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1)],
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1]);
+ dmrs_idx, l, k, k_prime, n, txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1)],
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1]);
#endif
dmrs_idx++;
k_prime++;
@@ -334,30 +334,40 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
n+=(k_prime)?0:1;
}
else if(is_ptrs_re){
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = (beta_ptrs*amp*mod_ptrs[ptrs_idx<<1]) >> 15;
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (beta_ptrs*amp*mod_ptrs[(ptrs_idx<<1) + 1])>> 15;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = (beta_ptrs*amp*mod_ptrs[ptrs_idx<<1]) >> 15;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (beta_ptrs*amp*mod_ptrs[(ptrs_idx<<1) + 1])>> 15;
#ifdef DEBUG_DLSCH_MAPPING
printf("ptrs_idx %d\t l %d \t k %d \t k_prime %d \t n %d \t txdataF: %d %d, mod_ptrs: %d %d\n",
+<<<<<<< HEAD
ptrs_idx, l, k, k_prime, n, ((int16_t*)txdataF[ap])[((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)],
((int16_t*)txdataF[ap])[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)],mod_ptrs[ptrs_idx<<1],mod_ptrs[(ptrs_idx<<1)+1]);
+=======
+ ptrs_idx, l, k, k_prime, n, ((int16_t*)txdataF_precoding[nl])[((l*frame_parms->ofdm_symbol_size + k)<<1)],
+ ((int16_t*)txdataF_precoding[nl])[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1],mod_ptrs[ptrs_idx<<1],mod_ptrs[(ptrs_idx<<1)+1]);
+>>>>>>> origin/develop
#endif
ptrs_idx++;
}
/* Map DATA Symbol */
else if( ptrs_symbol || allowed_xlsch_re_in_dmrs_symbol(k,start_sc,frame_parms->ofdm_symbol_size,rel15->numDmrsCdmGrpsNoData,dmrs_Type)) {
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = (amp * tx_layers[ap][m<<1]) >> 15;
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * tx_layers[ap][(m<<1) + 1]) >> 15;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = (amp * tx_layers[nl][m<<1]) >> 15;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * tx_layers[nl][(m<<1) + 1]) >> 15;
#ifdef DEBUG_DLSCH_MAPPING
printf("m %d\t l %d \t k %d \t txdataF: %d %d\n",
+<<<<<<< HEAD
m, l, k, txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1)],
txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1]);
+=======
+ m, l, k, txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1)],
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1]);
+>>>>>>> origin/develop
#endif
m++;
}
/* mute RE */
else {
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = 0;
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = 0;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = 0;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = 0;
}
if (++k >= frame_parms->ofdm_symbol_size)
k -= frame_parms->ofdm_symbol_size;
@@ -373,26 +383,26 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
}
// fix the alignment issues later, use 64-bit SIMD below instead of 128.
if (0/*(frame_parms->N_RB_DL&1)==0*/) {
- __m128i *txF=(__m128i*)&txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size+start_sc)<<1)];
+ __m128i *txF=(__m128i*)&txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size+start_sc)<<1)];
- __m128i *txl = (__m128i*)&tx_layers[ap][m<<1];
+ __m128i *txl = (__m128i*)&tx_layers[nl][m<<1];
__m128i amp128=_mm_set1_epi16(amp);
for (int i=0; i<(upper_limit>>2); i++) {
txF[i] = _mm_mulhrs_epi16(amp128,txl[i]);
} //RE loop, first part
m+=upper_limit;
if (remaining_re > 0) {
- txF = (__m128i*)&txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size)<<1)];
- txl = (__m128i*)&tx_layers[ap][m<<1];
+ txF = (__m128i*)&txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size)<<1)];
+ txl = (__m128i*)&tx_layers[nl][m<<1];
for (int i=0; i<(remaining_re>>2); i++) {
txF[i] = _mm_mulhrs_epi16(amp128,txl[i]);
}
}
}
else {
- __m64 *txF=(__m64*)&txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size+start_sc)<<1)];
+ __m64 *txF=(__m64*)&txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size+start_sc)<<1)];
- __m64 *txl = (__m64*)&tx_layers[ap][m<<1];
+ __m64 *txl = (__m64*)&tx_layers[nl][m<<1];
__m64 amp64=_mm_set1_pi16(amp);
for (int i=0; i<(upper_limit>>1); i++) {
@@ -400,31 +410,31 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
#ifdef DEBUG_DLSCH_MAPPING
if ((i&1) > 0)
printf("m %d\t l %d \t k %d \t txdataF: %d %d\n",
- m, l, start_sc+(i>>1), txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + start_sc+(i>>1))<<1)],
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + start_sc+(i>>1))<<1) + 1]);
+ m, l, start_sc+(i>>1), txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + start_sc+(i>>1))<<1)],
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + start_sc+(i>>1))<<1) + 1]);
#endif
/* handle this, mute RE */
/*else {
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = 0;
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = 0;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = 0;
+ txdataF_precoding[anl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = 0;
}*/
} //RE loop, first part
m+=upper_limit;
if (remaining_re > 0) {
- txF = (__m64*)&txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size)<<1)];
- txl = (__m64*)&tx_layers[ap][m<<1];
+ txF = (__m64*)&txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size)<<1)];
+ txl = (__m64*)&tx_layers[nl][m<<1];
for (int i=0; i<(remaining_re>>1); i++) {
txF[i] = _mm_mulhrs_pi16(amp64,txl[i]);
#ifdef DEBUG_DLSCH_MAPPING
if ((i&1) > 0)
printf("m %d\t l %d \t k %d \t txdataF: %d %d\n",
- m, l, i>>1, txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + (i>>1))<<1) ],
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + (i>>1))<<1) + 1]);
+ m, l, i>>1, txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + (i>>1))<<1) ],
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + (i>>1))<<1) + 1]);
#endif
/* handle this, mute RE */
/*else {
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = 0;
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = 0;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = 0;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = 0;
}*/
} //RE loop, second part
} //
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
index 6d16fa531c96f905abf93f7ba574207ad3aff017..cdf0e6c1527b0afbc354a37c261a84e9ac4fc2e4 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
@@ -55,42 +55,39 @@ void free_gNB_dlsch(NR_gNB_DLSCH_t **dlschptr, uint16_t N_RB) {
NR_gNB_DLSCH_t *dlsch = *dlschptr;
uint16_t a_segments = MAX_NUM_NR_DLSCH_SEGMENTS; //number of segments to be allocated
- if (dlsch) {
- if (N_RB != 273) {
- a_segments = a_segments*N_RB;
- a_segments = a_segments/273 +1;
- }
-
-#ifdef DEBUG_DLSCH_FREE
- LOG_D(PHY,"Freeing dlsch %p\n",dlsch);
-#endif
- NR_DL_gNB_HARQ_t *harq = &dlsch->harq_process;
-
- if (harq->b) {
- free16(harq->b, a_segments * 1056);
- harq->b = NULL;
-#ifdef DEBUG_DLSCH_FREE
- LOG_D(PHY, "Freeing harq->b (%p)\n", harq->b);
-#endif
- }
-
-#ifdef DEBUG_DLSCH_FREE
- LOG_D(PHY, "Freeing dlsch process %d c (%p)\n", i, harq->c);
-#endif
-
- for (r = 0; r < a_segments; r++) {
-#ifdef DEBUG_DLSCH_FREE
- LOG_D(PHY, "Freeing dlsch process %d c[%d] (%p)\n", i, r, harq->c[r]);
-#endif
-
- if (harq->c[r]) {
- free16(harq->c[r], 1056);
- harq->c[r] = NULL;
- }
- }
- free16(dlsch, sizeof(NR_gNB_DLSCH_t));
- *dlschptr = NULL;
+ if (N_RB != 273) {
+ a_segments = a_segments*N_RB;
+ a_segments = a_segments/273 +1;
}
+
+ NR_DL_gNB_HARQ_t *harq = &dlsch->harq_process;
+ if (harq->b) {
+ free16(harq->b, a_segments * 1056);
+ harq->b = NULL;
+ }
+ for (r = 0; r < a_segments; r++) {
+ free(harq->c[r]);
+ harq->c[r] = NULL;
+ }
+ free(harq->pdu);
+
+ for (int aa = 0; aa < 64; aa++)
+ free(dlsch->calib_dl_ch_estimates[aa]);
+ free(dlsch->calib_dl_ch_estimates);
+
+ for (int q=0; q<NR_MAX_NB_CODEWORDS; q++)
+ free(dlsch->mod_symbs[q]);
+
+ for (int layer = 0; layer < NR_MAX_NB_LAYERS; layer++) {
+ free(dlsch->txdataF_precoding[layer]);
+ free(dlsch->txdataF[layer]);
+ for (int aa = 0; aa < 64; aa++)
+ free(dlsch->ue_spec_bf_weights[layer][aa]);
+ free(dlsch->ue_spec_bf_weights[layer]);
+ }
+
+ free(dlsch);
+ *dlschptr = NULL;
}
NR_gNB_DLSCH_t *new_gNB_dlsch(NR_DL_FRAME_PARMS *frame_parms,
diff --git a/openair1/PHY/NR_TRANSPORT/nr_pbch.c b/openair1/PHY/NR_TRANSPORT/nr_pbch.c
index bf5edccb1bedccc6098d19d256bcd2b891cefdce..fc7df4649606902a073dd149197e6fbf49cb3ae7 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_pbch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_pbch.c
@@ -299,8 +299,8 @@ int nr_generate_pbch(nfapi_nr_dl_tti_ssb_pdu *ssb_pdu,
/// CRC, coding and rate matching
polar_encoder_fast (&a_reversed, (void*)pbch->pbch_e, 0, 0,
- nr_polar_params( NR_POLAR_PBCH_MESSAGE_TYPE, NR_POLAR_PBCH_PAYLOAD_BITS, NR_POLAR_PBCH_AGGREGATION_LEVEL,0,NULL)
- );
+ NR_POLAR_PBCH_MESSAGE_TYPE, NR_POLAR_PBCH_PAYLOAD_BITS, NR_POLAR_PBCH_AGGREGATION_LEVEL);
+
#ifdef DEBUG_PBCH_ENCODING
printf("Channel coding:\n");
diff --git a/openair1/PHY/NR_TRANSPORT/nr_transport_proto.h b/openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
index d45858bca0814c1155ffb4e86237e64602bb28b6..b62698c74844193d549ca0c69569b3b3fd69f98e 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
@@ -106,6 +106,8 @@ NR_gNB_DLSCH_t *new_gNB_dlsch(NR_DL_FRAME_PARMS *frame_parms,
uint8_t abstraction_flag,
uint16_t N_RB);
+void free_gNB_dlsch(NR_gNB_DLSCH_t **dlschptr, uint16_t N_RB);
+
/** \brief This function is the top-level entry point to PUSCH demodulation, after frequency-domain transformation and channel estimation. It performs
- RB extraction (signal and channel estimates)
- channel compensation (matched filtering)
@@ -296,6 +298,7 @@ int16_t find_nr_prach(PHY_VARS_gNB *gNB,int frame,int slot, find_type_t type);
int16_t find_nr_prach_ru(RU_t *ru,int frame,int slot, find_type_t type);
NR_gNB_PUCCH_t *new_gNB_pucch(void);
+void free_gNB_pucch(NR_gNB_PUCCH_t *pucch);
void nr_fill_pucch(PHY_VARS_gNB *gNB,
int frame,
@@ -308,6 +311,7 @@ int nr_find_pucch(uint16_t rnti,
PHY_VARS_gNB *gNB);
NR_gNB_SRS_t *new_gNB_srs(void);
+void free_gNB_srs(NR_gNB_SRS_t *srs);
int nr_find_srs(uint16_t rnti,
int frame,
diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch.h b/openair1/PHY/NR_TRANSPORT/nr_ulsch.h
index f7bb3be5772ecb11fe7e789ed9b07ac9b975ff41..0791fd2bbc63f982aca2e32248f4d4b844519102 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch.h
@@ -33,9 +33,9 @@
#include "PHY/defs_gNB.h"
#include "common/utils/threadPool/thread-pool.h"
-void free_gNB_ulsch(NR_gNB_ULSCH_t **ulsch,uint8_t N_RB_UL);
+void free_gNB_ulsch(NR_gNB_ULSCH_t **ulsch, uint16_t N_RB_UL);
-NR_gNB_ULSCH_t *new_gNB_ulsch(uint8_t max_ldpc_iterations,uint16_t N_RB_UL, uint8_t abstraction_flag);
+NR_gNB_ULSCH_t *new_gNB_ulsch(uint8_t max_ldpc_iterations, uint16_t N_RB_UL);
/*! \brief Perform PUSCH decoding. TS 38.212 V15.4.0 subclause 6.2
diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
index 23c44d19bb2a72a7ef8584e29ced59e2464a6612..7fc27aa1490ca5a02b545d708f7171e798238d34 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
@@ -54,60 +54,40 @@
//extern double cpuf;
-void free_gNB_ulsch(NR_gNB_ULSCH_t **ulschptr,uint8_t N_RB_UL)
+void free_gNB_ulsch(NR_gNB_ULSCH_t **ulschptr, uint16_t N_RB_UL)
{
int i,r;
uint16_t a_segments = MAX_NUM_NR_ULSCH_SEGMENTS; //number of segments to be allocated
NR_gNB_ULSCH_t *ulsch = *ulschptr;
- if (ulsch) {
- if (N_RB_UL != 273) {
- a_segments = a_segments*N_RB_UL;
- a_segments = a_segments/273 +1;
- }
-
-
- for (i=0; i<NR_MAX_ULSCH_HARQ_PROCESSES; i++) {
+ if (N_RB_UL != 273) {
+ a_segments = a_segments*N_RB_UL;
+ a_segments = a_segments/273 +1;
+ }
- if (ulsch->harq_processes[i]) {
- if (ulsch->harq_processes[i]->b) {
- free16(ulsch->harq_processes[i]->b,a_segments*1056);
- ulsch->harq_processes[i]->b = NULL;
- }
- for (r=0; r<a_segments; r++) {
- free16(ulsch->harq_processes[i]->c[r],(8448)*sizeof(uint8_t));
- ulsch->harq_processes[i]->c[r] = NULL;
- }
- for (r=0; r<a_segments; r++) {
- if (ulsch->harq_processes[i]->d[r]) {
- free16(ulsch->harq_processes[i]->d[r],(68*384)*sizeof(int16_t));
- ulsch->harq_processes[i]->d[r] = NULL;
- }
- }
- for (r=0; r<a_segments; r++) {
- if (ulsch->harq_processes[i]->w[r]) {
- free16(ulsch->harq_processes[i]->w[r],(3*(6144+64))*sizeof(int16_t));
- ulsch->harq_processes[i]->w[r] = NULL;
- }
- }
- for (r=0; r<a_segments; r++) {
- if (ulsch->harq_processes[i]->p_nrLDPC_procBuf[r]){
- nrLDPC_free_mem(ulsch->harq_processes[i]->p_nrLDPC_procBuf[r]);
- ulsch->harq_processes[i]->p_nrLDPC_procBuf[r] = NULL;
- }
- }
- free16(ulsch->harq_processes[i],sizeof(NR_UL_gNB_HARQ_t));
- ulsch->harq_processes[i] = NULL;
+ for (i=0; i<NR_MAX_ULSCH_HARQ_PROCESSES; i++) {
+ if (ulsch->harq_processes[i]) {
+ if (ulsch->harq_processes[i]->b) {
+ free_and_zero(ulsch->harq_processes[i]->b);
+ ulsch->harq_processes[i]->b = NULL;
+ }
+ for (r=0; r<a_segments; r++) {
+ free_and_zero(ulsch->harq_processes[i]->c[r]);
+ free_and_zero(ulsch->harq_processes[i]->d[r]);
+ free_and_zero(ulsch->harq_processes[i]->w[r]);
+ nrLDPC_free_mem(ulsch->harq_processes[i]->p_nrLDPC_procBuf[r]);
+ ulsch->harq_processes[i]->p_nrLDPC_procBuf[r] = NULL;
}
+ free_and_zero(ulsch->harq_processes[i]);
+ ulsch->harq_processes[i] = NULL;
}
- free16(ulsch,sizeof(NR_gNB_ULSCH_t));
- *ulschptr = NULL;
}
+ free_and_zero(*ulschptr);
}
-NR_gNB_ULSCH_t *new_gNB_ulsch(uint8_t max_ldpc_iterations,uint16_t N_RB_UL, uint8_t abstraction_flag)
+NR_gNB_ULSCH_t *new_gNB_ulsch(uint8_t max_ldpc_iterations, uint16_t N_RB_UL)
{
NR_gNB_ULSCH_t *ulsch;
@@ -129,13 +109,11 @@ NR_gNB_ULSCH_t *new_gNB_ulsch(uint8_t max_ldpc_iterations,uint16_t N_RB_UL, uint
ulsch->harq_processes[i] = (NR_UL_gNB_HARQ_t *)malloc16_clear(sizeof(NR_UL_gNB_HARQ_t));
ulsch->harq_processes[i]->b = (uint8_t*)malloc16_clear(ulsch_bytes);
- if (abstraction_flag == 0) {
- for (r=0; r<a_segments; r++) {
- ulsch->harq_processes[i]->p_nrLDPC_procBuf[r] = nrLDPC_init_mem();
- ulsch->harq_processes[i]->c[r] = (uint8_t*)malloc16_clear(8448*sizeof(uint8_t));
- ulsch->harq_processes[i]->d[r] = (int16_t*)malloc16_clear((68*384)*sizeof(int16_t));
- ulsch->harq_processes[i]->w[r] = (int16_t*)malloc16_clear((3*(6144+64))*sizeof(int16_t));
- }
+ for (r=0; r<a_segments; r++) {
+ ulsch->harq_processes[i]->p_nrLDPC_procBuf[r] = nrLDPC_init_mem();
+ ulsch->harq_processes[i]->c[r] = (uint8_t*)malloc16_clear(8448*sizeof(uint8_t));
+ ulsch->harq_processes[i]->d[r] = (int16_t*)malloc16_clear((68*384)*sizeof(int16_t));
+ ulsch->harq_processes[i]->w[r] = (int16_t*)malloc16_clear((3*(6144+64))*sizeof(int16_t));
}
}
@@ -480,7 +458,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
A = (harq_process->TBS)<<3;
- LOG_D(PHY,"ULSCH Decoding, harq_pid %d TBS %d G %d mcs %d Nl %d nb_rb %d, Qm %d, n_layers %d, Coderate %d\n",harq_pid,A,G, mcs, n_layers, nb_rb, Qm, n_layers, R);
+ LOG_D(NR_PHY, "ULSCH Decoding, harq_pid %d TBS %d G %d mcs %d Nl %d nb_rb %d, Qm %d, n_layers %d, Coderate %d\n", harq_pid, A, G, mcs, n_layers, nb_rb, Qm, n_layers, R);
if (R<1024)
Coderate = (float) R /(float) 1024;
diff --git a/openair1/PHY/NR_TRANSPORT/pucch_rx.c b/openair1/PHY/NR_TRANSPORT/pucch_rx.c
index b8285debc05cd871154a4a8655e5829a6d6cdcbe..283ff1934cca2d59dc7a45f0f71b82df580daae8 100644
--- a/openair1/PHY/NR_TRANSPORT/pucch_rx.c
+++ b/openair1/PHY/NR_TRANSPORT/pucch_rx.c
@@ -62,6 +62,11 @@ NR_gNB_PUCCH_t *new_gNB_pucch(void){
return (pucch);
}
+void free_gNB_pucch(NR_gNB_PUCCH_t *pucch)
+{
+ free_and_zero(pucch);
+}
+
int nr_find_pucch(uint16_t rnti,
int frame,
int slot,
@@ -1533,7 +1538,6 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB,
}
else { // polar coded case
- t_nrPolar_params *currentPtr = nr_polar_params(2,nb_bit,pucch_pdu->prb_size,1,&gNB->uci_polarParams);
__m64 *rp_re[Prx2][2];
__m64 *rp2_re[Prx2][2];
__m64 *rp_im[Prx2][2];
@@ -1660,7 +1664,7 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB,
} // half_prb
} // symb
// run polar decoder on llrs
- decoderState = polar_decoder_int16((int16_t*)llrs, decodedPayload, 0, currentPtr);
+ decoderState = polar_decoder_int16((int16_t*)llrs, decodedPayload, 0, 2,nb_bit,pucch_pdu->prb_size);
LOG_D(PHY,"UCI decoderState %d, payload[0] %llu\n",decoderState,(unsigned long long)decodedPayload[0]);
if (decoderState>0) decoderState=1;
corr_dB = dB_fixed64(corr);
diff --git a/openair1/PHY/NR_TRANSPORT/srs_rx.c b/openair1/PHY/NR_TRANSPORT/srs_rx.c
index c16becdb20b2aa0403ef19253e6379f565c86076..2d7aefdee082b5b6baeb03e104de8a828aaf791f 100644
--- a/openair1/PHY/NR_TRANSPORT/srs_rx.c
+++ b/openair1/PHY/NR_TRANSPORT/srs_rx.c
@@ -49,6 +49,11 @@ NR_gNB_SRS_t *new_gNB_srs(void){
return (srs);
}
+void free_gNB_srs(NR_gNB_SRS_t *srs)
+{
+ free_and_zero(srs);
+}
+
int nr_find_srs(uint16_t rnti,
int frame,
int slot,
diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c b/openair1/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c
index 19d4bf5079e08073040a4c71c2619d90fa6920fe..15f3abad795b143de81a9a01888e2e3d6a2a0ee7 100644
--- a/openair1/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c
+++ b/openair1/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c
@@ -115,12 +115,6 @@ void nr_adjust_synch_ue(NR_DL_FRAME_PARMS *frame_parms,
}
}
- if (ue->rx_offset < 0)
- ue->rx_offset += frame_parms->samples_per_frame;
-
- if (ue->rx_offset >= frame_parms->samples_per_frame)
- ue->rx_offset -= frame_parms->samples_per_frame;
-
#ifdef DEBUG_PHY
LOG_D(PHY,"AbsSubframe %d: diff = %i, rx_offset (final) = %i : clear = %d, max_pos = %d, max_pos_fil = %d, max_val = %d, sync_pos %d\n",
subframe,
diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
index 30eae2d30f511255e56bef6783b2f116c2e626a9..7281f8e29074f2fb7c1b038c41ab0e9856ac9ef6 100644
--- a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
+++ b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
@@ -642,6 +642,7 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
unsigned short p,
unsigned char symbol,
unsigned short BWPStart,
+ uint8_t config_type,
unsigned short bwp_start_subcarrier,
unsigned short nb_rb_pdsch)
{
@@ -653,10 +654,6 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
int16_t *fl=NULL,*fm=NULL,*fr=NULL,*fml=NULL,*fmr=NULL,*fmm=NULL,*fdcl=NULL,*fdcr=NULL,*fdclh=NULL,*fdcrh=NULL, *frl=NULL, *frr=NULL;
int ch_offset,symbol_offset;
- NR_UE_DLSCH_t **dlsch = ue->dlsch[proc->thread_id][gNB_id];
- const unsigned char harq_pid = dlsch[0]->current_harq_pid;
- NR_DL_UE_HARQ_t *dlsch0_harq = dlsch[0]->harq_processes[harq_pid];
-
uint8_t nushift;
int **dl_ch_estimates =ue->pdsch_vars[proc->thread_id][gNB_id]->dl_ch_estimates;
int **rxdataF=ue->common_vars.common_vars_rx_data_per_thread[proc->thread_id].rxdataF;
@@ -678,7 +675,6 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
if (is_SI) {
rb_offset -= BWPStart;
}
- uint8_t config_type = dlsch0_harq->dmrsConfigType;
int8_t delta = get_delta(p, config_type);
// checking if re-initialization of scrambling IDs is needed
diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h b/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h
index c5330ce2f2e7e2a98f3d77591046f4ea8bb6cc84..4dec92143a10799ac41aa946c3a199dd6fe2b947 100644
--- a/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h
+++ b/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h
@@ -72,6 +72,7 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
unsigned short p,
unsigned char symbol,
unsigned short BWPStart,
+ uint8_t config_type,
unsigned short bwp_start_subcarrier,
unsigned short nb_rb_pdsch);
diff --git a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
index 84c9627c8a0fc6ffb78f6fd199cd42eb4f7d888d..5e18f6cc6d799ea0e7f608e0d93601e525fb3ad8 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
@@ -130,76 +130,75 @@ void nr_pdcch_demapping_deinterleaving(uint32_t *llr,
*/
int c = 0, r = 0;
- uint16_t bundle_j = 0, f_bundle_j = 0, f_reg = 0;
+ uint16_t f_bundle_j = 0;
uint32_t coreset_C = 0;
uint16_t index_z, index_llr;
int coreset_interleaved = 0;
+ int N_regs = coreset_nbr_rb*coreset_time_dur;
if (reg_bundle_size_L != 0) { // interleaving will be done only if reg_bundle_size_L != 0
coreset_interleaved = 1;
- coreset_C = (uint32_t) (coreset_nbr_rb / (coreset_interleaver_size_R * reg_bundle_size_L));
+ coreset_C = (uint32_t) (N_regs / (coreset_interleaver_size_R * reg_bundle_size_L));
} else {
reg_bundle_size_L = 6;
}
+ int B_rb = reg_bundle_size_L/coreset_time_dur; // nb of RBs occupied by each REG bundle
+ int num_bundles_per_cce = 6/reg_bundle_size_L;
+ int max_bundles = NR_MAX_PDCCH_AGG_LEVEL*num_bundles_per_cce;
+ int f_bundle_j_list[max_bundles];
- int f_bundle_j_list[(2*NR_MAX_PDCCH_AGG_LEVEL) - 1] = {};
-
- for (int reg = 0; reg < coreset_nbr_rb; reg++) {
- if ((reg % reg_bundle_size_L) == 0) {
+ // for each bundle
+ for (int nb = 0; nb < max_bundles; nb++) {
+ if (coreset_interleaved == 0) f_bundle_j = nb;
+ else {
if (r == coreset_interleaver_size_R) {
r = 0;
c++;
}
-
- bundle_j = (c * coreset_interleaver_size_R) + r;
- f_bundle_j = ((r * coreset_C) + c + n_shift) % (coreset_nbr_rb / reg_bundle_size_L);
-
- if (coreset_interleaved == 0) f_bundle_j = bundle_j;
-
- f_bundle_j_list[reg / 6] = f_bundle_j;
-
+ f_bundle_j = ((r * coreset_C) + c + n_shift) % (N_regs / reg_bundle_size_L);
+ r++;
}
- if ((reg % reg_bundle_size_L) == 0) r++;
+ f_bundle_j_list[nb] = f_bundle_j;
}
- // Get cce_list indices by reg_idx in ascending order
- int f_bundle_j_list_id = 0;
- int f_bundle_j_list_ord[(2*NR_MAX_PDCCH_AGG_LEVEL)-1] = {};
+ // Get cce_list indices by bundle index in ascending order
+ int f_bundle_j_list_ord[number_of_candidates][max_bundles];
for (int c_id = 0; c_id < number_of_candidates; c_id++ ) {
- f_bundle_j_list_id = CCE[c_id];
- for (int p = 0; p < NR_MAX_PDCCH_AGG_LEVEL; p++) {
- for (int p2 = CCE[c_id]; p2 < CCE[c_id] + L[c_id]; p2++) {
- AssertFatal(p2<2*NR_MAX_PDCCH_AGG_LEVEL,"number_of_candidates %d : p2 %d, CCE[%d] %d, L[%d] %d\n",number_of_candidates,p2,c_id,CCE[c_id],c_id,L[c_id]);
- if (f_bundle_j_list[p2] == p) {
- AssertFatal(f_bundle_j_list_id < 2*NR_MAX_PDCCH_AGG_LEVEL,"f_bundle_j_list_id %d\n",f_bundle_j_list_id);
- f_bundle_j_list_ord[f_bundle_j_list_id] = p;
+ int start_bund_cand = CCE[c_id]*num_bundles_per_cce;
+ int max_bund_per_cand = L[c_id]*num_bundles_per_cce;
+ int f_bundle_j_list_id = 0;
+ for(int nb = 0; nb < max_bundles; nb++) {
+ for(int bund_cand = start_bund_cand; bund_cand < start_bund_cand+max_bund_per_cand; bund_cand++){
+ if (f_bundle_j_list[bund_cand] == nb) {
+ f_bundle_j_list_ord[c_id][f_bundle_j_list_id] = nb;
f_bundle_j_list_id++;
- break;
+
}
}
}
}
- int rb = 0;
+ int rb_count = 0;
+ int data_sc = 9; // 9 sub-carriers with data per PRB
for (int c_id = 0; c_id < number_of_candidates; c_id++ ) {
for (int symbol_idx = start_symbol; symbol_idx < start_symbol+coreset_time_dur; symbol_idx++) {
- for (int cce_count = CCE[c_id/coreset_time_dur]+c_id%coreset_time_dur; cce_count < CCE[c_id/coreset_time_dur]+c_id%coreset_time_dur+L[c_id]; cce_count += coreset_time_dur) {
- for (int reg_in_cce_idx = 0; reg_in_cce_idx < NR_NB_REG_PER_CCE; reg_in_cce_idx++) {
-
- f_reg = (f_bundle_j_list_ord[cce_count] * reg_bundle_size_L) + reg_in_cce_idx;
- index_z = 9 * rb;
- index_llr = (uint16_t) (f_reg + symbol_idx * coreset_nbr_rb) * 9;
-
- for (int i = 0; i < 9; i++) {
- z[index_z + i] = llr[index_llr + i];
+ for (int cce_count = 0; cce_count < L[c_id]; cce_count ++) {
+ for (int k=0; k<NR_NB_REG_PER_CCE/reg_bundle_size_L; k++) { // loop over REG bundles
+ int f = f_bundle_j_list_ord[c_id][k+NR_NB_REG_PER_CCE*cce_count/reg_bundle_size_L];
+ for(int rb=0; rb<B_rb; rb++) { // loop over the RBs of the bundle
+ index_z = data_sc * rb_count;
+ index_llr = (uint16_t) (f*B_rb + rb + symbol_idx * coreset_nbr_rb) * data_sc;
+ for (int i = 0; i < data_sc; i++) {
+ z[index_z + i] = llr[index_llr + i];
#ifdef NR_PDCCH_DCI_DEBUG
- LOG_I(PHY,"[cce_count=%d,reg_in_cce_idx=%d,bundle_j=%d,symbol_idx=%d,candidate=%d] z[%d]=(%d,%d) <-> \t[f_reg=%d,fbundle_j=%d] llr[%d]=(%d,%d) \n",
- cce_count,reg_in_cce_idx,bundle_j,symbol_idx,c_id,(index_z + i),*(int16_t *) &z[index_z + i],*(1 + (int16_t *) &z[index_z + i]),
- f_reg,f_bundle_j,(index_llr + i),*(int16_t *) &llr[index_llr + i], *(1 + (int16_t *) &llr[index_llr + i]));
+ LOG_I(PHY,"[candidate=%d,symbol_idx=%d,cce=%d,REG bundle=%d,PRB=%d] z[%d]=(%d,%d) <-> \t llr[%d]=(%d,%d) \n",
+ c_id,symbol_idx,cce_count,k,f*B_rb + rb,(index_z + i),*(int16_t *) &z[index_z + i],*(1 + (int16_t *) &z[index_z + i]),
+ (index_llr + i),*(int16_t *) &llr[index_llr + i], *(1 + (int16_t *) &llr[index_llr + i]));
#endif
+ }
+ rb_count++;
}
- rb++;
}
}
}
@@ -783,15 +782,7 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
rel15->number_of_candidates,
rel15->CCE,
rel15->L);
- /*
- nr_pdcch_unscrambling(rel15->rnti,
- frame_parms,
- slot,
- pdcch_vars->e_rx,
- rel15->coreset.duration*n_rb*9*2,
- // get_nCCE(n_pdcch_symbols, frame_parms, mi) * 72,
- rel15->coreset.pdcch_dmrs_scrambling_id);
- */
+
LOG_D(PHY,"we end nr_pdcch_unscrambling()\n");
LOG_D(PHY,"Ending nr_rx_pdcch() function\n");
@@ -832,14 +823,18 @@ void nr_pdcch_unscrambling(int16_t *z,
/* This function compares the received DCI bits with
* re-encoded DCI bits and returns the number of mismatched bits
*/
-uint16_t nr_dci_false_detection(uint64_t *dci,
- int16_t *soft_in,
- const t_nrPolar_params *polar_param,
- int encoded_length,
- int rnti) {
+static uint16_t nr_dci_false_detection(uint64_t *dci,
+ int16_t *soft_in,
+ int encoded_length,
+ int rnti,
+ int8_t messageType,
+ uint16_t messageLength,
+ uint8_t aggregation_level
+ ) {
uint32_t encoder_output[NR_MAX_DCI_SIZE_DWORD];
- polar_encoder_fast(dci, (void*)encoder_output, rnti, 1, (t_nrPolar_params *)polar_param);
+ polar_encoder_fast(dci, (void*)encoder_output, rnti, 1,
+ messageType, messageLength, aggregation_level);
uint8_t *enout_p = (uint8_t*)encoder_output;
uint16_t x = 0;
@@ -866,6 +861,7 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
//int gNB_id = 0;
int16_t tmp_e[16*108];
rnti_t n_rnti;
+ int e_rx_cand_idx = 0;
for (int j=0;j<rel15->number_of_candidates;j++) {
int CCEind = rel15->CCE[j];
@@ -886,26 +882,24 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
if (dci_found==1) continue;
int dci_length = rel15->dci_length_options[k];
uint64_t dci_estimation[2]= {0};
- const t_nrPolar_params *currentPtrDCI = nr_polar_params(NR_POLAR_DCI_MESSAGE_TYPE, dci_length, L, 1, &ue->polarList);
LOG_D(PHY, "Trying DCI candidate %d of %d number of candidates, CCE %d (%d), L %d, length %d, format %s\n",
- j, rel15->number_of_candidates, CCEind, CCEind*9*6*2, L, dci_length,nr_dci_format_string[rel15->dci_format_options[k]]);
+ j, rel15->number_of_candidates, CCEind, e_rx_cand_idx, L, dci_length,nr_dci_format_string[rel15->dci_format_options[k]]);
- nr_pdcch_unscrambling(&pdcch_vars->e_rx[CCEind*108], rel15->coreset.scrambling_rnti, L*108, rel15->coreset.pdcch_dmrs_scrambling_id, tmp_e);
+ nr_pdcch_unscrambling(&pdcch_vars->e_rx[e_rx_cand_idx], rel15->coreset.scrambling_rnti, L*108, rel15->coreset.pdcch_dmrs_scrambling_id, tmp_e);
#ifdef DEBUG_DCI_DECODING
- uint32_t * z = (uint32_t *) &pdcch_vars->e_rx[CCEind*108];
- for (int index_z = 0; index_z < 96; index_z++){
+ uint32_t *z = (uint32_t *) &pdcch_vars->e_rx[e_rx_cand_idx];
+ for (int index_z = 0; index_z < L*6; index_z++){
for (int i=0; i<9; i++) {
LOG_D(PHY,"z[%d]=(%d,%d) \n", (9*index_z + i), *(int16_t *) &z[index_z + i],*(1 + (int16_t *) &z[index_z + i]));
}
}
#endif
-
uint16_t crc = polar_decoder_int16(tmp_e,
dci_estimation,
1,
- currentPtrDCI);
+ NR_POLAR_DCI_MESSAGE_TYPE, dci_length, L);
n_rnti = rel15->rnti;
LOG_D(PHY, "(%i.%i) dci indication (rnti %x,dci format %s,n_CCE %d,payloadSize %d)\n",
@@ -913,7 +907,7 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
if (crc == n_rnti) {
LOG_D(PHY, "(%i.%i) Received dci indication (rnti %x,dci format %s,n_CCE %d,payloadSize %d,payload %llx)\n",
proc->frame_rx, proc->nr_slot_rx,n_rnti,nr_dci_format_string[rel15->dci_format_options[k]],CCEind,dci_length,*(unsigned long long*)dci_estimation);
- uint16_t mb = nr_dci_false_detection(dci_estimation,tmp_e,currentPtrDCI,L*108,n_rnti);
+ uint16_t mb = nr_dci_false_detection(dci_estimation,tmp_e,L*108,n_rnti, NR_POLAR_DCI_MESSAGE_TYPE, dci_length, L);
ue->dci_thres = (ue->dci_thres + mb) / 2;
if (mb > (ue->dci_thres+20)) {
LOG_W(PHY,"DCI false positive. Dropping DCI index %d. Mismatched bits: %d/%d. Current DCI threshold: %d\n",j,mb,L*108,ue->dci_thres);
@@ -935,6 +929,7 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
LOG_D(PHY,"(%i.%i) Decoded crc %x does not match rnti %x for DCI format %d\n", proc->frame_rx, proc->nr_slot_rx, crc, n_rnti, rel15->dci_format_options[k]);
}
}
+ e_rx_cand_idx += 9*L*6*2; //e_rx index for next candidate (L CCEs, 6 REGs per CCE and 9 REs per REG and 2 uint16_t per RE)
}
pdcch_vars->nb_search_space = 0;
return(dci_ind->number_of_dcis);
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
index 8064093eed6e86c78ae92d29fb3143ee45480b30..a9b8ce2e557c158b0fdc6ec6e44d068a1211201e 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -79,7 +79,7 @@ void init_dlsch_tpool(uint8_t num_dlsch_threads) {
free(params);
}
-void free_nr_ue_dlsch(NR_UE_DLSCH_t **dlschptr,uint8_t N_RB_DL) {
+void free_nr_ue_dlsch(NR_UE_DLSCH_t **dlschptr, uint16_t N_RB_DL) {
int i,r;
uint16_t a_segments = MAX_NUM_NR_DLSCH_SEGMENTS; //number of segments to be allocated
NR_UE_DLSCH_t *dlsch=*dlschptr;
@@ -131,7 +131,7 @@ void free_nr_ue_dlsch(NR_UE_DLSCH_t **dlschptr,uint8_t N_RB_DL) {
}
}
-NR_UE_DLSCH_t *new_nr_ue_dlsch(uint8_t Kmimo,uint8_t Mdlharq,uint32_t Nsoft,uint8_t max_ldpc_iterations,uint16_t N_RB_DL, uint8_t abstraction_flag) {
+NR_UE_DLSCH_t *new_nr_ue_dlsch(uint8_t Kmimo,uint8_t Mdlharq,uint32_t Nsoft,uint8_t max_ldpc_iterations,uint16_t N_RB_DL) {
NR_UE_DLSCH_t *dlsch;
uint8_t exit_flag = 0,i,r;
uint16_t a_segments = MAX_NUM_NR_DLSCH_SEGMENTS; //number of segments to be allocated
@@ -167,30 +167,28 @@ NR_UE_DLSCH_t *new_nr_ue_dlsch(uint8_t Kmimo,uint8_t Mdlharq,uint32_t Nsoft,uint
else
exit_flag=3;
- if (abstraction_flag == 0) {
- for (r=0; r<a_segments; r++) {
- dlsch->harq_processes[i]->p_nrLDPC_procBuf[r] = nrLDPC_init_mem();
- dlsch->harq_processes[i]->c[r] = (uint8_t *)malloc16(1056);
+ for (r=0; r<a_segments; r++) {
+ dlsch->harq_processes[i]->p_nrLDPC_procBuf[r] = nrLDPC_init_mem();
+ dlsch->harq_processes[i]->c[r] = (uint8_t *)malloc16(1056);
- if (dlsch->harq_processes[i]->c[r])
- memset(dlsch->harq_processes[i]->c[r],0,1056);
- else
- exit_flag=2;
+ if (dlsch->harq_processes[i]->c[r])
+ memset(dlsch->harq_processes[i]->c[r],0,1056);
+ else
+ exit_flag=2;
- dlsch->harq_processes[i]->d[r] = (short *)malloc16((5*8448)*sizeof(short));
+ dlsch->harq_processes[i]->d[r] = (short *)malloc16((5*8448)*sizeof(short));
- if (dlsch->harq_processes[i]->d[r])
- memset(dlsch->harq_processes[i]->d[r],0,(5*8448)*sizeof(short));
- else
- exit_flag=2;
+ if (dlsch->harq_processes[i]->d[r])
+ memset(dlsch->harq_processes[i]->d[r],0,(5*8448)*sizeof(short));
+ else
+ exit_flag=2;
- dlsch->harq_processes[i]->w[r] = (short *)malloc16((5*8448)*sizeof(short));
+ dlsch->harq_processes[i]->w[r] = (short *)malloc16((5*8448)*sizeof(short));
- if (dlsch->harq_processes[i]->w[r])
- memset(dlsch->harq_processes[i]->w[r],0,(5*8448)*sizeof(short));
- else
- exit_flag=2;
- }
+ if (dlsch->harq_processes[i]->w[r])
+ memset(dlsch->harq_processes[i]->w[r],0,(5*8448)*sizeof(short));
+ else
+ exit_flag=2;
}
} else {
exit_flag=1;
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
index 075aaecc08d64e253d224995c42ce76a62d72cb8..75517b7a6f519a94cb4d9a0e7769cd413b123097 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
@@ -931,12 +931,12 @@ void nr_dlsch_channel_compensation(int **rxdataF_ext,
for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {
for (aatx=0; aatx<nb_aatx; aatx++) {
- dl_ch128 = (__m128i *)&dl_ch_estimates_ext[aatx*frame_parms->nb_antennas_rx+aarx][symbol*nb_rb*12];
for (atx=0; atx<nb_aatx; atx++) {
avg_rho_re[aarx][aatx*nb_aatx+atx] = 0;
avg_rho_im[aarx][aatx*nb_aatx+atx] = 0;
rho128 = (__m128i *)&rho[aarx][aatx*nb_aatx+atx][symbol*nb_rb*12];
+ dl_ch128 = (__m128i *)&dl_ch_estimates_ext[aatx*frame_parms->nb_antennas_rx+aarx][symbol*nb_rb*12];
dl_ch128_2 = (__m128i *)&dl_ch_estimates_ext[atx*frame_parms->nb_antennas_rx+aarx][symbol*nb_rb*12];
for (rb=0; rb<nb_rb_0; rb++) {
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
index 8917a8bc1b1ebc4ca0a6db92073c18be024e044c..d7b1a030c9966b9c60ce86b07a180c45a29d0637 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
@@ -31,8 +31,6 @@
*/
#include "PHY/types.h"
#include "PHY/defs_nr_UE.h"
-#include "PHY/phy_extern_nr_ue.h"
-#include "PHY/INIT/phy_init.h"
#include "PHY/MODULATION/modulation_UE.h"
#include "nr_transport_proto_ue.h"
#include "PHY/NR_UE_ESTIMATION/nr_estimation.h"
@@ -46,7 +44,6 @@
#include "PHY/NR_REFSIG/pss_nr.h"
#include "PHY/NR_REFSIG/sss_nr.h"
#include "PHY/NR_REFSIG/refsig_defs_ue.h"
-#include "PHY/NR_TRANSPORT/nr_dci.h"
extern openair0_config_t openair0_cfg[];
//static nfapi_nr_config_request_t config_t;
@@ -200,6 +197,7 @@ int nr_initial_sync(UE_nr_rxtx_proc_t *proc,
{
int32_t sync_pos, sync_pos_frame; // k_ssb, N_ssb_crb, sync_pos2,
+ int32_t accumulated_freq_offset = 0;
int32_t metric_tdd_ncp=0;
uint8_t phase_tdd_ncp;
double im, re;
@@ -248,22 +246,30 @@ int nr_initial_sync(UE_nr_rxtx_proc_t *proc,
LOG_I(PHY,"sync_pos %d ssb_offset %d \n",sync_pos,ue->ssb_offset);
#endif
+ accumulated_freq_offset += ue->common_vars.freq_offset;
+
// digital compensation of FFO for SSB symbols
- if (ue->UE_fo_compensation){
- double s_time = 1/(1.0e3*fp->samples_per_subframe); // sampling time
- double off_angle = -2*M_PI*s_time*(ue->common_vars.freq_offset); // offset rotation angle compensation per sample
-
- int start = is*fp->samples_per_frame+ue->ssb_offset; // start for offset correction is at ssb_offset (pss time position)
- int end = start + 4*(fp->ofdm_symbol_size + fp->nb_prefix_samples); // loop over samples in 4 symbols (ssb size), including prefix
-
- for(int n=start; n<end; n++){
- for (int ar=0; ar<fp->nb_antennas_rx; ar++) {
- re = ((double)(((short *)ue->common_vars.rxdata[ar]))[2*n]);
- im = ((double)(((short *)ue->common_vars.rxdata[ar]))[2*n+1]);
- ((short *)ue->common_vars.rxdata[ar])[2*n] = (short)(round(re*cos(n*off_angle) - im*sin(n*off_angle)));
- ((short *)ue->common_vars.rxdata[ar])[2*n+1] = (short)(round(re*sin(n*off_angle) + im*cos(n*off_angle)));
- }
- }
+ if (ue->UE_fo_compensation){
+ double s_time = 1/(1.0e3*fp->samples_per_subframe); // sampling time
+ double off_angle = -2*M_PI*s_time*(ue->common_vars.freq_offset); // offset rotation angle compensation per sample
+
+ // In SA we need to perform frequency offset correction until the end of buffer because we need to decode SIB1
+ // and we do not know yet in which slot it goes.
+
+ // start for offset correction
+ int start = sa ? is*fp->samples_per_frame : is*fp->samples_per_frame + ue->ssb_offset;
+
+ // loop over samples
+ int end = sa ? n_frames*fp->samples_per_frame-1 : start + NR_N_SYMBOLS_SSB*(fp->ofdm_symbol_size + fp->nb_prefix_samples);
+
+ for(int n=start; n<end; n++){
+ for (int ar=0; ar<fp->nb_antennas_rx; ar++) {
+ re = ((double)(((short *)ue->common_vars.rxdata[ar]))[2*n]);
+ im = ((double)(((short *)ue->common_vars.rxdata[ar]))[2*n+1]);
+ ((short *)ue->common_vars.rxdata[ar])[2*n] = (short)(round(re*cos(n*off_angle) - im*sin(n*off_angle)));
+ ((short *)ue->common_vars.rxdata[ar])[2*n+1] = (short)(round(re*sin(n*off_angle) + im*cos(n*off_angle)));
+ }
+ }
}
/* check that SSS/PBCH block is continuous inside the received buffer */
@@ -289,7 +295,34 @@ int nr_initial_sync(UE_nr_rxtx_proc_t *proc,
LOG_I(PHY,"Calling sss detection (normal CP)\n");
#endif
- rx_sss_nr(ue, proc, &metric_tdd_ncp, &phase_tdd_ncp);
+ int freq_offset_sss = 0;
+ rx_sss_nr(ue, proc, &metric_tdd_ncp, &phase_tdd_ncp, &freq_offset_sss);
+
+ accumulated_freq_offset += freq_offset_sss;
+
+ // digital compensation of FFO for SSB symbols
+ if (ue->UE_fo_compensation){
+ double s_time = 1/(1.0e3*fp->samples_per_subframe); // sampling time
+ double off_angle = -2*M_PI*s_time*freq_offset_sss; // offset rotation angle compensation per sample
+
+ // In SA we need to perform frequency offset correction until the end of buffer because we need to decode SIB1
+ // and we do not know yet in which slot it goes.
+
+ // start for offset correction
+ int start = sa ? is*fp->samples_per_frame : is*fp->samples_per_frame + ue->ssb_offset;
+
+ // loop over samples
+ int end = sa ? n_frames*fp->samples_per_frame-1 : start + NR_N_SYMBOLS_SSB*(fp->ofdm_symbol_size + fp->nb_prefix_samples);
+
+ for(int n=start; n<end; n++){
+ for (int ar=0; ar<fp->nb_antennas_rx; ar++) {
+ re = ((double)(((short *)ue->common_vars.rxdata[ar]))[2*n]);
+ im = ((double)(((short *)ue->common_vars.rxdata[ar]))[2*n+1]);
+ ((short *)ue->common_vars.rxdata[ar])[2*n] = (short)(round(re*cos(n*off_angle) - im*sin(n*off_angle)));
+ ((short *)ue->common_vars.rxdata[ar])[2*n+1] = (short)(round(re*sin(n*off_angle) + im*cos(n*off_angle)));
+ }
+ }
+ }
nr_gold_pbch(ue);
ret = nr_pbch_detection(proc, ue, 1); // start pbch detection at first symbol after pss
@@ -304,6 +337,22 @@ int nr_initial_sync(UE_nr_rxtx_proc_t *proc,
sync_pos_frame = n_symb_prefix0*(fp->ofdm_symbol_size + fp->nb_prefix_samples0)+(ue->symbol_offset-n_symb_prefix0)*(fp->ofdm_symbol_size + fp->nb_prefix_samples);
// for a correct computation of frame number to sync with the one decoded at MIB we need to take into account in which of the n_frames we got sync
ue->init_sync_frame = n_frames - 1 - is;
+
+ // compute the scramblingID_pdcch and the gold pdcch
+ ue->scramblingID_pdcch = fp->Nid_cell;
+ nr_gold_pdcch(ue,fp->Nid_cell);
+
+ // compute the scrambling IDs for PDSCH DMRS
+ for (int i=0; i<2; i++)
+ ue->scramblingID[i]=fp->Nid_cell;
+
+ nr_gold_pdsch(ue,ue->scramblingID);
+
+ // initialize the pusch dmrs
+ uint16_t N_n_scid[2] = {fp->Nid_cell,fp->Nid_cell};
+ int n_scid = 0; // This quantity is indicated by higher layer parameter dmrs-SeqInitialization
+ nr_init_pusch_dmrs(ue, N_n_scid, n_scid);
+
// we also need to take into account the shift by samples_per_frame in case the if is true
if (ue->ssb_offset < sync_pos_frame){
ue->rx_offset = fp->samples_per_frame - sync_pos_frame + ue->ssb_offset;
@@ -536,6 +585,8 @@ int nr_initial_sync(UE_nr_rxtx_proc_t *proc,
}
if (dec == false) // sib1 not decoded
ret = -1;
+
+ ue->common_vars.freq_offset = accumulated_freq_offset;
}
// exit_fun("debug exit");
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_NR_INITIAL_UE_SYNC, VCD_FUNCTION_OUT);
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c b/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c
index dff347f7c04fb0cc8a6bff4e1a9e994551d817a6..6b5185dc2ce1af902ca5b2e372d9c16caa0301c3 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c
@@ -533,8 +533,8 @@ int nr_rx_pbch( PHY_VARS_NR_UE *ue,
nr_pbch_unscrambling(nr_ue_pbch_vars,frame_parms->Nid_cell,nushift,M,NR_POLAR_PBCH_E,0,0);
//polar decoding de-rate matching
- const t_nrPolar_params *currentPtr = nr_polar_params( NR_POLAR_PBCH_MESSAGE_TYPE, NR_POLAR_PBCH_PAYLOAD_BITS, NR_POLAR_PBCH_AGGREGATION_LEVEL,1,&ue->polarList);
- decoderState = polar_decoder_int16(pbch_e_rx,(uint64_t *)&nr_ue_pbch_vars->pbch_a_prime,0,currentPtr);
+ decoderState = polar_decoder_int16(pbch_e_rx,(uint64_t *)&nr_ue_pbch_vars->pbch_a_prime,0,
+ NR_POLAR_PBCH_MESSAGE_TYPE, NR_POLAR_PBCH_PAYLOAD_BITS, NR_POLAR_PBCH_AGGREGATION_LEVEL);
if(decoderState) return(decoderState);
@@ -601,7 +601,7 @@ int nr_rx_pbch( PHY_VARS_NR_UE *ue,
#endif
nr_downlink_indication_t dl_indication;
- fapi_nr_rx_indication_t *rx_ind = calloc(1, sizeof(*rx_ind));
+ fapi_nr_rx_indication_t *rx_ind=calloc(sizeof(*rx_ind),1);
uint16_t number_pdus = 1;
nr_fill_dl_indication(&dl_indication, NULL, rx_ind, proc, ue, gNB_id);
@@ -609,6 +609,8 @@ int nr_rx_pbch( PHY_VARS_NR_UE *ue,
if (ue->if_inst && ue->if_inst->dl_indication)
ue->if_inst->dl_indication(&dl_indication, NULL);
+ else
+ free(rx_ind); // dl_indication would free(), so free() here if not called
return 0;
}
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
index 239731208eb45ff117e4faff8ecee59348aef30b..9bc3643557e6155546e2d9aeeddd5dc1d5415d8a 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
@@ -50,24 +50,23 @@
\brief This function frees memory allocated for a particular DLSCH at UE
@param dlsch Pointer to DLSCH to be removed
*/
-void free_nr_ue_dlsch(NR_UE_DLSCH_t **dlsch,uint8_t N_RB_DL);
+void free_nr_ue_dlsch(NR_UE_DLSCH_t **dlsch, uint16_t N_RB_DL);
-/** \fn new_ue_dlsch(uint8_t Kmimo,uint8_t Mdlharq,uint32_t Nsoft,uint8_t abstraction_flag)
+/** \fn new_ue_dlsch(uint8_t Kmimo,uint8_t Mdlharq,uint32_t Nsoft)
\brief This function allocates structures for a particular DLSCH at UE
@returns Pointer to DLSCH to be removed
@param Kmimo Kmimo factor from 36-212/36-213
@param Mdlharq Maximum number of HARQ rounds (36-212/36-213)
@param Nsoft Soft-LLR buffer size from UE-Category
@params N_RB_DL total number of resource blocks (determine the operating BW)
- @param abstraction_flag Flag to indicate abstracted interface
*/
-NR_UE_DLSCH_t *new_nr_ue_dlsch(uint8_t Kmimo,uint8_t Mdlharq,uint32_t Nsoft,uint8_t max_turbo_iterations,uint16_t N_RB_DL, uint8_t abstraction_flag);
+NR_UE_DLSCH_t *new_nr_ue_dlsch(uint8_t Kmimo,uint8_t Mdlharq,uint32_t Nsoft,uint8_t max_turbo_iterations,uint16_t N_RB_DL);
-void free_nr_ue_ulsch(NR_UE_ULSCH_t **ulsch,unsigned char N_RB_UL);
+void free_nr_ue_ulsch(NR_UE_ULSCH_t **ulsch, uint16_t N_RB_UL);
-NR_UE_ULSCH_t *new_nr_ue_ulsch(uint16_t N_RB_UL, int number_of_harq_pids, uint8_t abstraction_flag);
+NR_UE_ULSCH_t *new_nr_ue_ulsch(uint16_t N_RB_UL, int number_of_harq_pids);
/** \brief This function computes the LLRs for ML (max-logsum approximation) dual-stream QPSK/QPSK reception.
@param stream0_in Input from channel compensated (MR combined) stream 0
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
index 553d4fa4f7baed980f9aeefb0d0432a7a32093ed..0ab4c94b963d604549c89dfcf2dfe35aa0c71fb1 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
@@ -43,7 +43,7 @@
//#define DEBUG_ULSCH_CODING
-void free_nr_ue_ulsch(NR_UE_ULSCH_t **ulschptr,unsigned char N_RB_UL)
+void free_nr_ue_ulsch(NR_UE_ULSCH_t **ulschptr, uint16_t N_RB_UL)
{
int i, r;
@@ -105,12 +105,8 @@ void free_nr_ue_ulsch(NR_UE_ULSCH_t **ulschptr,unsigned char N_RB_UL)
}
-NR_UE_ULSCH_t *new_nr_ue_ulsch(uint16_t N_RB_UL,
- int number_of_harq_pids,
- uint8_t abstraction_flag)
+NR_UE_ULSCH_t *new_nr_ue_ulsch(uint16_t N_RB_UL, int number_of_harq_pids)
{
- NR_UE_ULSCH_t *ulsch;
- unsigned char exit_flag = 0,i,r;
uint16_t a_segments = MAX_NUM_NR_ULSCH_SEGMENTS; //number of segments to be allocated
if (N_RB_UL != 273) {
@@ -120,97 +116,54 @@ NR_UE_ULSCH_t *new_nr_ue_ulsch(uint16_t N_RB_UL,
uint32_t ulsch_bytes = a_segments*1056; // allocated bytes per segment
- ulsch = (NR_UE_ULSCH_t *)malloc16(sizeof(NR_UE_ULSCH_t));
+ NR_UE_ULSCH_t *ulsch = malloc16(sizeof(NR_UE_ULSCH_t));
+ DevAssert(ulsch);
+ memset(ulsch, 0, sizeof(*ulsch));
- if (ulsch) {
- memset(ulsch,0,sizeof(NR_UE_ULSCH_t));
-
- ulsch->number_harq_processes_for_pusch = NR_MAX_ULSCH_HARQ_PROCESSES;
- ulsch->Mlimit = 4; // maximum harq retransmissions
+ ulsch->number_harq_processes_for_pusch = NR_MAX_ULSCH_HARQ_PROCESSES;
+ ulsch->Mlimit = 4; // maximum harq retransmissions
- //for (i=0; i<10; i++)
- //ulsch->harq_ids[i] = 0;
+ //for (i=0; i<10; i++)
+ //ulsch->harq_ids[i] = 0;
- for (i=0; i<number_of_harq_pids; i++) {
+ for (int i = 0; i < number_of_harq_pids; i++) {
- ulsch->harq_processes[i] = (NR_UL_UE_HARQ_t *)malloc16(sizeof(NR_UL_UE_HARQ_t));
+ ulsch->harq_processes[i] = malloc16(sizeof(NR_UL_UE_HARQ_t));
+ DevAssert(ulsch->harq_processes[i]);
+ memset(ulsch->harq_processes[i], 0, sizeof(NR_UL_UE_HARQ_t));
- // printf("ulsch->harq_processes[%d] %p\n",i,ulsch->harq_processes[i]);
- if (ulsch->harq_processes[i]) {
- memset(ulsch->harq_processes[i], 0, sizeof(NR_UL_UE_HARQ_t));
- ulsch->harq_processes[i]->b = (uint8_t*)malloc16(ulsch_bytes);
- ulsch->harq_processes[i]->a = (unsigned char*)malloc16(ulsch_bytes);
+ ulsch->harq_processes[i]->a = malloc16(ulsch_bytes);
+ DevAssert(ulsch->harq_processes[i]->a);
+ bzero(ulsch->harq_processes[i]->a,ulsch_bytes);
- if (ulsch->harq_processes[i]->a) {
- bzero(ulsch->harq_processes[i]->a,ulsch_bytes);
- } else {
- printf("Can't allocate PDU\n");
- exit_flag=1;
- }
+ ulsch->harq_processes[i]->b = malloc16(ulsch_bytes);
+ DevAssert(ulsch->harq_processes[i]->b);
+ bzero(ulsch->harq_processes[i]->b,ulsch_bytes);
- if (ulsch->harq_processes[i]->b)
- bzero(ulsch->harq_processes[i]->b,ulsch_bytes);
- else {
- LOG_E(PHY,"Can't get b\n");
- exit_flag=1;
- }
-
- if (abstraction_flag==0) {
- for (r=0; r<a_segments; r++) {
- // account for filler in first segment and CRCs for multiple segment case
- ulsch->harq_processes[i]->c[r] = (uint8_t*)malloc16(8448);
- ulsch->harq_processes[i]->d[r] = (uint8_t*)malloc16(68*384); //max size for coded output
-
- if (ulsch->harq_processes[i]->c[r]) {
- bzero(ulsch->harq_processes[i]->c[r],8448);
- } else {
- printf("Can't get c\n");
- exit_flag=2;
- }
- if (ulsch->harq_processes[i]->d[r]) {
- bzero(ulsch->harq_processes[i]->d[r],(68*384));
- } else {
- printf("Can't get d\n");
- exit_flag=2;
- }
- }
- ulsch->harq_processes[i]->e = (uint8_t*)malloc16(14*N_RB_UL*12*8);
- if (ulsch->harq_processes[i]->e) {
- bzero(ulsch->harq_processes[i]->e,14*N_RB_UL*12*8);
- } else {
- printf("Can't get e\n");
- exit_flag=1;
- }
- ulsch->harq_processes[i]->f = (uint8_t*)malloc16(14*N_RB_UL*12*8);
- if (ulsch->harq_processes[i]->f) {
- bzero(ulsch->harq_processes[i]->f,14*N_RB_UL*12*8);
- } else {
- printf("Can't get f\n");
- exit_flag=1;
- }
- }
+ for (int r = 0; r < a_segments; r++) {
+ // account for filler in first segment and CRCs for multiple segment case
+ ulsch->harq_processes[i]->c[r] = malloc16(8448);
+ DevAssert(ulsch->harq_processes[i]->c[r]);
+ bzero(ulsch->harq_processes[i]->c[r],8448);
- ulsch->harq_processes[i]->subframe_scheduling_flag = 0;
- ulsch->harq_processes[i]->first_tx = 1;
- } else {
- LOG_E(PHY,"Can't get harq_p %d\n",i);
- exit_flag=3;
- }
+ ulsch->harq_processes[i]->d[r] = malloc16(68*384); //max size for coded output
+ DevAssert(ulsch->harq_processes[i]->d[r]);
+ bzero(ulsch->harq_processes[i]->d[r],(68*384));
}
- if (exit_flag==0) {
- for (i=0; i<number_of_harq_pids; i++) {
- ulsch->harq_processes[i]->round=0;
- }
- return(ulsch);
- }
- }
+ ulsch->harq_processes[i]->e = malloc16(14*N_RB_UL*12*8);
+ DevAssert(ulsch->harq_processes[i]->e);
+ bzero(ulsch->harq_processes[i]->e,14*N_RB_UL*12*8);
- LOG_E(PHY,"new_ue_ulsch exit flag, size of %d , %zu\n",exit_flag, sizeof(LTE_UE_ULSCH_t));
- free_nr_ue_ulsch(&ulsch,N_RB_UL);
- return(NULL);
+ ulsch->harq_processes[i]->f = malloc16(14*N_RB_UL*12*8);
+ DevAssert(ulsch->harq_processes[i]->f);
+ bzero(ulsch->harq_processes[i]->f,14*N_RB_UL*12*8);
+ ulsch->harq_processes[i]->subframe_scheduling_flag = 0;
+ ulsch->harq_processes[i]->first_tx = 1;
+ }
+ return(ulsch);
}
@@ -263,9 +216,9 @@ int nr_ulsch_encoding(PHY_VARS_NR_UE *ue,
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_NR_UE_ULSCH_ENCODING, VCD_FUNCTION_IN);
- LOG_D(PHY,"ulsch coding nb_rb %d, Nl = %d\n", nb_rb, harq_process->pusch_pdu.nrOfLayers);
- LOG_D(PHY,"ulsch coding A %d G %d mod_order %d\n", A,G, mod_order);
- LOG_D(PHY,"harq_pid %d harq_process->ndi %d, pusch_data.new_data_indicator %d\n",
+ LOG_D(NR_PHY, "ulsch coding nb_rb %d, Nl = %d\n", nb_rb, harq_process->pusch_pdu.nrOfLayers);
+ LOG_D(NR_PHY, "ulsch coding A %d G %d mod_order %d\n", A, G, mod_order);
+ LOG_D(NR_PHY, "harq_pid %d harq_process->ndi %d, pusch_data.new_data_indicator %d\n",
harq_pid,harq_process->ndi,harq_process->pusch_pdu.pusch_data.new_data_indicator);
if (harq_process->first_tx == 1 ||
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
index 0c188e9119ff49a4a1b9137b9cf4295b8354127e..41cf9c2ffaa248f9fe0b4bbe8ab1455e841fef68 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
@@ -128,7 +128,6 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
NR_UE_PUSCH *pusch_ue = UE->pusch_vars[thread_id][gNB_id];
uint8_t num_of_codewords = 1; // tmp assumption
- int Nid_cell = 0;
int N_PRB_oh = 0; // higher layer (RRC) parameter xOverhead in PUSCH-ServingCellConfig
uint16_t number_dmrs_symbols = 0;
@@ -153,7 +152,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
if (start_sc >= frame_parms->ofdm_symbol_size)
start_sc -= frame_parms->ofdm_symbol_size;
- ulsch_ue->Nid_cell = Nid_cell;
+ ulsch_ue->Nid_cell = frame_parms->Nid_cell;
for (int i = start_symbol; i < start_symbol + number_of_symbols; i++) {
if((ul_dmrs_symb_pos >> i) & 0x01)
@@ -391,7 +390,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
// Perform this on gold sequence, not required when SC FDMA operation is done,
LOG_D(PHY,"DMRS in symbol %d\n",l);
nr_modulation(pusch_dmrs[l][0], n_dmrs*2, DMRS_MOD_ORDER, mod_dmrs); // currently only codeword 0 is modulated. Qm = 2 as DMRS is QPSK modulated
-
+
} else {
dmrs_idx = 0;
}
diff --git a/openair1/PHY/NR_UE_TRANSPORT/pss_nr.c b/openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
index 28b6677b2ca9f0a5e7c77e9841b0246242ba6115..88bdc3a9cd1392dbfdef6adacc0e9b75041fa8c0 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
@@ -34,6 +34,7 @@
#include <assert.h>
#include <errno.h>
#include <math.h>
+#include <nr-uesoftmodem.h>
#include "PHY/defs_nr_UE.h"
@@ -439,33 +440,10 @@ void init_context_pss_nr(NR_DL_FRAME_PARMS *frame_parms_ue)
void free_context_pss_nr(void)
{
for (int i = 0; i < NUMBER_PSS_SEQUENCE; i++) {
-
- if (primary_synchro_time_nr[i] != NULL) {
- free(primary_synchro_time_nr[i]);
- primary_synchro_time_nr[i] = NULL;
- }
- else {
- LOG_E(PHY,"Fatal memory deallocation problem \n");
- assert(0);
- }
-
- if (primary_synchro_nr[i] != NULL) {
- free(primary_synchro_nr[i]);
- primary_synchro_nr[i] = NULL;
- }
- else {
- LOG_E(PHY,"Fatal memory deallocation problem \n");
- assert(0);
- }
-
- if (pss_corr_ue[i] != NULL) {
- free(pss_corr_ue[i]);
- pss_corr_ue[i] = NULL;
- }
- else {
- LOG_E(PHY,"Fatal memory deallocation problem \n");
- assert(0);
- }
+ free_and_zero(primary_synchro_nr[i]);
+ free_and_zero(primary_synchro_nr2[i]);
+ free_and_zero(primary_synchro_time_nr[i]);
+ free_and_zero(pss_corr_ue[i]);
}
}
diff --git a/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c b/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
index ddec605253b3f87779c62761061ea4b01fe139de..4dcce9f60fda9b959a70de7f15c0b5149ca07850 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
@@ -850,7 +850,7 @@ static inline void nr_pucch2_3_4_scrambling(uint16_t M_bit,uint16_t rnti,uint16_
printf("\t\t [nr_pucch2_3_4_scrambling] scrambling M_bit=%d bits\n", M_bit);
#endif
}
-void nr_uci_encoding(uint64_t payload,
+static void nr_uci_encoding(uint64_t payload,
uint8_t nr_bit,
int fmt,
uint8_t is_pi_over_2_bpsk_enabled,
@@ -946,12 +946,10 @@ void nr_uci_encoding(uint64_t payload,
AssertFatal(nrofPRB<=16,"Number of PRB >16\n");
} else if (A>=12) {
AssertFatal(A<65,"Polar encoding not supported yet for UCI with more than 64 bits\n");
- t_nrPolar_params *currentPtr = nr_polar_params(NR_POLAR_UCI_PUCCH_MESSAGE_TYPE,
- A,
- nrofPRB,
- 1,
- NULL);
- polar_encoder_fast(&payload, b, 0,0,currentPtr);
+ polar_encoder_fast(&payload, b, 0,0,
+ NR_POLAR_UCI_PUCCH_MESSAGE_TYPE,
+ A,
+ nrofPRB);
}
}
diff --git a/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c b/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c
index 9339f3974d4cdb31cb01c12ad35e655cc3aebd89..dc73fe0add1226bfaeff3d433ee7d613d9d601ce 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c
@@ -420,7 +420,7 @@ int pss_sss_extract_nr(PHY_VARS_NR_UE *phy_vars_ue,
*
*********************************************************************/
-int rx_sss_nr(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int32_t *tot_metric, uint8_t *phase_max)
+int rx_sss_nr(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int32_t *tot_metric, uint8_t *phase_max, int *freq_offset_sss)
{
uint8_t i;
int32_t pss_ext[NB_ANTENNAS_RX][LENGTH_PSS_NR];
@@ -558,5 +558,19 @@ int rx_sss_nr(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int32_t *tot_metric,
}
//#endif
+ int re = 0;
+ int im = 0;
+ d = (int16_t *)&d_sss[Nid2][Nid1];
+ for(i = 0; i<LENGTH_SSS_NR; i++) {
+ re += d[i]*sss[2*i];
+ im += d[i]*sss[2*i+1];
+ }
+ double ffo_sss = atan2(im,re)/M_PI/4.3;
+ *freq_offset_sss = (int)(ffo_sss*frame_parms->subcarrier_spacing);
+
+ double ffo_pss = ((double)ue->common_vars.freq_offset)/frame_parms->subcarrier_spacing;
+ LOG_I(NR_PHY, "ffo_pss %f (%i Hz), ffo_sss %f (%i Hz), ffo_pss+ffo_sss %f (%i Hz)\n",
+ ffo_pss, (int)(ffo_pss*frame_parms->subcarrier_spacing), ffo_sss, *freq_offset_sss, ffo_pss+ffo_sss, (int)((ffo_pss+ffo_sss)*frame_parms->subcarrier_spacing));
+
return(0);
}
diff --git a/openair1/PHY/TOOLS/lte_enb_scope.c b/openair1/PHY/TOOLS/lte_enb_scope.c
index 7fde9f244c00468c3c13913186bf6813c69a0549..0e873addbcf44f6c73fe1d205b311f0e4cee831e 100644
--- a/openair1/PHY/TOOLS/lte_enb_scope.c
+++ b/openair1/PHY/TOOLS/lte_enb_scope.c
@@ -49,12 +49,6 @@ void reset_stats(FL_OBJECT *button, long arg) {
int i,j,k;
PHY_VARS_eNB *phy_vars_eNB = RC.eNB[0][0];
- printf("XXX %d %d %d\n",
- sizeofArray(phy_vars_eNB->UE_stats),
- sizeofArray( phy_vars_eNB->UE_stats[i].dlsch_NAK),
- sizeofArray( *phy_vars_eNB->UE_stats[i].dlsch_NAK)
- );
-
for (i=0; i<sizeofArray(phy_vars_eNB->UE_stats); i++) {
for (k=0; k<sizeofArray(phy_vars_eNB->UE_stats[i].dlsch_NAK); k++) { //harq_processes
for (j=0; j<sizeofArray(*phy_vars_eNB->UE_stats[i].dlsch_NAK); j++) {
diff --git a/openair1/PHY/defs_UE.h b/openair1/PHY/defs_UE.h
index 2d2697a4b7afbdd4611d49496bac350616a16bcf..fc3d939f65d2b665f912a147aaf33052cf12716c 100644
--- a/openair1/PHY/defs_UE.h
+++ b/openair1/PHY/defs_UE.h
@@ -55,7 +55,6 @@
#include <string.h>
#include <math.h>
#include "common_lib.h"
-#include "msc.h"
#include "defs_common.h"
#include "impl_defs_top.h"
diff --git a/openair1/PHY/defs_common.h b/openair1/PHY/defs_common.h
index a371b2334ba4f008fcdf0a76dbda3cf4f9b0dd47..c79530434aee8f29bc82f3929ff9052013119cea 100644
--- a/openair1/PHY/defs_common.h
+++ b/openair1/PHY/defs_common.h
@@ -54,7 +54,6 @@
#include <string.h>
#include <math.h>
#include "common_lib.h"
-#include "msc.h"
#include <common/utils/LOG/log.h>
#include "assertions.h"
diff --git a/openair1/PHY/defs_eNB.h b/openair1/PHY/defs_eNB.h
index 030d50bc048f74190379cf184c5dae5c1eb87b38..995a4a934e4d0e603d19314dfc03b762c948b763 100644
--- a/openair1/PHY/defs_eNB.h
+++ b/openair1/PHY/defs_eNB.h
@@ -55,7 +55,6 @@
#include <unistd.h>
#include "common_lib.h"
-#include "msc.h"
#include "defs_common.h"
#include "defs_RU.h"
#include "impl_defs_top.h"
diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h
index 7c7d30a6e2f21ddb8c5dcf73fa7fb6f809f17320..34dadf5bfdd6e07a97da40437d52fe7eafcc9195 100644
--- a/openair1/PHY/defs_gNB.h
+++ b/openair1/PHY/defs_gNB.h
@@ -779,7 +779,7 @@ typedef struct PHY_VARS_gNB_s {
/// statistics for ULSCH measurement collection
NR_gNB_SCH_STATS_t ulsch_stats[NUMBER_OF_NR_SCH_STATS_MAX];
NR_gNB_UCI_STATS_t uci_stats[NUMBER_OF_NR_UCI_STATS_MAX];
- t_nrPolar_params *uci_polarParams;
+ t_nrPolar_params **polarParams;
/// SRS variables
nr_srs_info_t *nr_srs_info[NUMBER_OF_NR_SRS_MAX];
diff --git a/openair1/PHY/defs_nr_UE.h b/openair1/PHY/defs_nr_UE.h
index bca956bf75bcafb31526b77f3a2a803201bb17ad..653b435e128d12c789800f9f228f9f7a84d9cfcb 100644
--- a/openair1/PHY/defs_nr_UE.h
+++ b/openair1/PHY/defs_nr_UE.h
@@ -44,7 +44,6 @@
#include <string.h>
#include <math.h>
#include "common_lib.h"
-#include "msc.h"
#include "fapi_nr_ue_interface.h"
#include "assertions.h"
@@ -815,7 +814,6 @@ typedef struct {
fapi_nr_config_request_t nrUE_config;
- t_nrPolar_params *polarList;
NR_UE_PDSCH *pdsch_vars[RX_NB_TH_MAX][NUMBER_OF_CONNECTED_gNB_MAX+1]; // two RxTx Threads
NR_UE_PBCH *pbch_vars[NUMBER_OF_CONNECTED_gNB_MAX];
NR_UE_PDCCH *pdcch_vars[RX_NB_TH_MAX][NUMBER_OF_CONNECTED_gNB_MAX];
diff --git a/openair1/PHY/defs_nr_common.h b/openair1/PHY/defs_nr_common.h
index 78599dcbb65f3ab118aad088eecf24c2101e4fd5..d3352fb520dc05fbcbd5fb4d7335ec3e609f561c 100644
--- a/openair1/PHY/defs_nr_common.h
+++ b/openair1/PHY/defs_nr_common.h
@@ -387,8 +387,6 @@ struct NR_DL_FRAME_PARMS {
uint8_t N_ssb;
/// SSB index
uint8_t ssb_index;
- /// PBCH polar encoder params
- t_nrPolar_params pbch_polar_params;
/// OFDM symbol offset divisor for UL
uint32_t ofdm_offset_divisor;
};
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index 569d2a464a10397b72744f025d4a198375312c40..ee1e0be49af41369d6a57fa79a29b14e99c63ca5 100644
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -43,7 +43,6 @@
#include <nfapi/oai_integration/nfapi_pnf.h>
#include "assertions.h"
-#include "msc.h"
#include <time.h>
diff --git a/openair1/SCHED/prach_procedures.c b/openair1/SCHED/prach_procedures.c
index 4d0fe428e84de72f10712063e27cb673f46c77e3..805354ce1be5ce7d7b7043f60e44482807fc78e0 100644
--- a/openair1/SCHED/prach_procedures.c
+++ b/openair1/SCHED/prach_procedures.c
@@ -40,7 +40,6 @@
#include "assertions.h"
-#include "msc.h"
#include <time.h>
diff --git a/openair1/SCHED/ru_procedures.c b/openair1/SCHED/ru_procedures.c
index 15eba7b5bc4f59bfacbd13b83d6383c5451680e9..dc84279a961b5d3b024d96244923e8d758cb10af 100644
--- a/openair1/SCHED/ru_procedures.c
+++ b/openair1/SCHED/ru_procedures.c
@@ -69,7 +69,6 @@
#include "assertions.h"
#include "common/utils/system.h"
-#include "msc.h"
#include <time.h>
diff --git a/openair1/SCHED_NR/nr_prach_procedures.c b/openair1/SCHED_NR/nr_prach_procedures.c
index 1ea8dbdf3c4878dd40c4004880eda98523e3a1f3..b0f59d5f471781a92e85949bb32229f84ad96ee5 100644
--- a/openair1/SCHED_NR/nr_prach_procedures.c
+++ b/openair1/SCHED_NR/nr_prach_procedures.c
@@ -41,7 +41,6 @@
#include "assertions.h"
-#include "msc.h"
#include <time.h>
diff --git a/openair1/SCHED_NR/nr_ru_procedures.c b/openair1/SCHED_NR/nr_ru_procedures.c
index 4d3174007a62d7895fbe92f32ceb4bc6c1ed6c34..b90f14a129d44de093a8109d0563326a6ce047b8 100644
--- a/openair1/SCHED_NR/nr_ru_procedures.c
+++ b/openair1/SCHED_NR/nr_ru_procedures.c
@@ -44,7 +44,6 @@
#include "T.h"
#include "assertions.h"
-#include "msc.h"
#include <time.h>
// RU OFDM Modulator gNodeB
diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
index a3f0c75d6aea6e678b4d2c138a1dee08feff6106..6ba673dbc72f5f8292fae308f986cb02f5e87369 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -39,7 +39,6 @@
#include "executables/softmodem-common.h"
#include "assertions.h"
-#include "msc.h"
#include <time.h>
diff --git a/openair1/SCHED_NR/sched_nr.h b/openair1/SCHED_NR/sched_nr.h
index d7e0332b85a5865b87814896ad24fe8deef8a38d..2124397c47eac5fe700bdf5aecae38f6bfb5306b 100644
--- a/openair1/SCHED_NR/sched_nr.h
+++ b/openair1/SCHED_NR/sched_nr.h
@@ -54,5 +54,6 @@ void nr_fep_full(RU_t *ru, int slot);
void nr_fep_full_2thread(RU_t *ru, int slot);
void feptx_prec(RU_t *ru,int frame_tx,int tti_tx);
int nr_phy_init_RU(RU_t *ru);
+void nr_phy_free_RU(RU_t *ru);
#endif
diff --git a/openair1/SCHED_NR/vars.h b/openair1/SCHED_NR/vars.h
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/openair1/SCHED_NR_UE/defs.h b/openair1/SCHED_NR_UE/defs.h
index b85d4c1b507b43e6b62d11d4ebfdaa31ce582638..c362bb470f4297456d5fbaa302aceedf8be825a6 100644
--- a/openair1/SCHED_NR_UE/defs.h
+++ b/openair1/SCHED_NR_UE/defs.h
@@ -295,9 +295,6 @@ uint8_t nr_pdcch_alloc2ul_subframe(NR_DL_FRAME_PARMS *frame_parms,uint8_t n);
uint32_t nr_pdcch_alloc2ul_frame(NR_DL_FRAME_PARMS *frame_parms,uint32_t frame, uint8_t n);
-uint16_t nr_get_Np(uint8_t N_RB_DL,uint8_t nCCE,uint8_t plus1);
-
-
int8_t nr_find_ue(uint16_t rnti, PHY_VARS_eNB *phy_vars_eNB);
/*! \brief UL time alignment procedures for TA application
diff --git a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
index 485d732c04be4e836e08a6c4fe28fd1d9105a594..8af91b1f386508b33d6b41cfaa17c8bf36a0c074 100644
--- a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+++ b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
@@ -90,8 +90,11 @@ int8_t nr_ue_scheduled_response_stub(nr_scheduled_response_t *scheduled_response
rx_ind->pdu_list[j].pdu = CALLOC(tx_req_body->pdu_length, sizeof(*rx_ind->pdu_list[j].pdu));
memcpy(rx_ind->pdu_list[j].pdu, tx_req_body->pdu, tx_req_body->pdu_length * sizeof(*rx_ind->pdu_list[j].pdu));
rx_ind->pdu_list[j].rnti = pusch_config_pdu->rnti;
- rx_ind->pdu_list[j].timing_advance = scheduled_response->tx_request->tx_config.timing_advance;
- rx_ind->pdu_list[j].ul_cqi = scheduled_response->tx_request->tx_config.ul_cqi;
+ /* TODO: Implement channel modeling to abstract TA and CQI. For now,
+ we hard code the values below since they are set in L1 and we are
+ abstracting L1. */
+ rx_ind->pdu_list[j].timing_advance = 31;
+ rx_ind->pdu_list[j].ul_cqi = 255;
char buffer[1024];
hexdump(rx_ind->pdu_list[j].pdu, rx_ind->pdu_list[j].pdu_length, buffer, sizeof(buffer));
LOG_D(NR_MAC, "Hexdump of pdu %s before queuing rx_ind\n",
@@ -113,7 +116,7 @@ int8_t nr_ue_scheduled_response_stub(nr_scheduled_response_t *scheduled_response
crc_ind->crc_list[j].num_cb = pusch_config_pdu->pusch_data.num_cb;
crc_ind->crc_list[j].rnti = pusch_config_pdu->rnti;
crc_ind->crc_list[j].tb_crc_status = 0;
- crc_ind->crc_list[j].timing_advance = scheduled_response->tx_request->tx_config.timing_advance;
+ crc_ind->crc_list[j].timing_advance = 31;
crc_ind->crc_list[j].ul_cqi = 255;
}
@@ -204,12 +207,66 @@ int8_t nr_ue_scheduled_response_stub(nr_scheduled_response_t *scheduled_response
}
}
}
+ dl_config->number_pdus = 0;
}
}
return 0;
}
+
+void configure_dlsch(NR_UE_DLSCH_t *dlsch0,
+ fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu,
+ module_id_t module_id,
+ int rnti) {
+
+ const uint8_t current_harq_pid = dlsch_config_pdu->harq_process_nbr;
+ dlsch0->current_harq_pid = current_harq_pid;
+ dlsch0->active = 1;
+ dlsch0->rnti = rnti;
+
+ LOG_D(PHY,"current_harq_pid = %d\n", current_harq_pid);
+
+ NR_DL_UE_HARQ_t *dlsch0_harq = dlsch0->harq_processes[current_harq_pid];
+ AssertFatal(dlsch0_harq, "no harq_process for HARQ PID %d\n", current_harq_pid);
+
+ dlsch0_harq->BWPStart = dlsch_config_pdu->BWPStart;
+ dlsch0_harq->BWPSize = dlsch_config_pdu->BWPSize;
+ dlsch0_harq->nb_rb = dlsch_config_pdu->number_rbs;
+ dlsch0_harq->start_rb = dlsch_config_pdu->start_rb;
+ dlsch0_harq->nb_symbols = dlsch_config_pdu->number_symbols;
+ dlsch0_harq->start_symbol = dlsch_config_pdu->start_symbol;
+ dlsch0_harq->dlDmrsSymbPos = dlsch_config_pdu->dlDmrsSymbPos;
+ dlsch0_harq->dmrsConfigType = dlsch_config_pdu->dmrsConfigType;
+ dlsch0_harq->n_dmrs_cdm_groups = dlsch_config_pdu->n_dmrs_cdm_groups;
+ dlsch0_harq->dmrs_ports = dlsch_config_pdu->dmrs_ports;
+ dlsch0_harq->mcs = dlsch_config_pdu->mcs;
+ dlsch0_harq->rvidx = dlsch_config_pdu->rv;
+ dlsch0->g_pucch = dlsch_config_pdu->accumulated_delta_PUCCH;
+ //get nrOfLayers from DCI info
+ uint8_t Nl = 0;
+ for (int i = 0; i < 12; i++) { // max 12 ports
+ if ((dlsch_config_pdu->dmrs_ports>>i)&0x01) Nl += 1;
+ }
+ dlsch0_harq->Nl = Nl;
+ dlsch0_harq->mcs_table=dlsch_config_pdu->mcs_table;
+ downlink_harq_process(dlsch0_harq, dlsch0->current_harq_pid, dlsch_config_pdu->ndi, dlsch_config_pdu->rv, dlsch0->rnti_type);
+ if (dlsch0_harq->status != ACTIVE) {
+ // dlsch0_harq->status not ACTIVE due to false retransmission
+ // Reset the following flag to skip PDSCH procedures in that case and retrasmit harq status
+ dlsch0->active = 0;
+ update_harq_status(module_id,dlsch0->current_harq_pid,dlsch0_harq->ack);
+ }
+ /* PTRS */
+ dlsch0_harq->PTRSFreqDensity = dlsch_config_pdu->PTRSFreqDensity;
+ dlsch0_harq->PTRSTimeDensity = dlsch_config_pdu->PTRSTimeDensity;
+ dlsch0_harq->PTRSPortIndex = dlsch_config_pdu->PTRSPortIndex;
+ dlsch0_harq->nEpreRatioOfPDSCHToPTRS = dlsch_config_pdu->nEpreRatioOfPDSCHToPTRS;
+ dlsch0_harq->PTRSReOffset = dlsch_config_pdu->PTRSReOffset;
+ dlsch0_harq->pduBitmap = dlsch_config_pdu->pduBitmap;
+ LOG_D(MAC, ">>>> \tdlsch0->g_pucch = %d\tdlsch0_harq.mcs = %d\n", dlsch0->g_pucch, dlsch0_harq->mcs);
+}
+
int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
bool found = false;
@@ -217,7 +274,6 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
module_id_t module_id = scheduled_response->module_id;
uint8_t cc_id = scheduled_response->CC_id, thread_id;
- uint32_t i;
int slot = scheduled_response->slot;
// Note: we have to handle the thread IDs for this. To be revisited completely.
@@ -229,89 +285,53 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
if(scheduled_response->dl_config != NULL){
fapi_nr_dl_config_request_t *dl_config = scheduled_response->dl_config;
-
+ fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu;
+ fapi_nr_dl_config_dci_dl_pdu_rel15_t *pdcch_config;
pdcch_vars->nb_search_space = 0;
- for (i = 0; i < dl_config->number_pdus; ++i){
+ for (int i = 0; i < dl_config->number_pdus; ++i){
AssertFatal(dl_config->number_pdus < FAPI_NR_DL_CONFIG_LIST_NUM,"dl_config->number_pdus %d out of bounds\n",dl_config->number_pdus);
AssertFatal(dl_config->dl_config_list[i].pdu_type<=FAPI_NR_DL_CONFIG_TYPES,"pdu_type %d > 2\n",dl_config->dl_config_list[i].pdu_type);
LOG_D(PHY, "In %s: frame %d slot %d received 1 DL %s PDU of %d total DL PDUs:\n",
__FUNCTION__, scheduled_response->frame, slot, dl_pdu_type[dl_config->dl_config_list[i].pdu_type - 1], dl_config->number_pdus);
- if (dl_config->dl_config_list[i].pdu_type == FAPI_NR_DL_CONFIG_TYPE_DCI) {
-
- fapi_nr_dl_config_dci_dl_pdu_rel15_t *pdcch_config = &dl_config->dl_config_list[i].dci_config_pdu.dci_config_rel15;
- memcpy((void*)&pdcch_vars->pdcch_config[pdcch_vars->nb_search_space],(void*)pdcch_config,sizeof(*pdcch_config));
- pdcch_vars->nb_search_space = pdcch_vars->nb_search_space + 1;
- pdcch_vars->sfn = scheduled_response->frame;
- pdcch_vars->slot = slot;
- LOG_D(PHY,"Number of DCI SearchSpaces %d\n",pdcch_vars->nb_search_space);
-
- } else {
-
- fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu = &dl_config->dl_config_list[i].dlsch_config_pdu.dlsch_config_rel15;
- uint8_t current_harq_pid = dlsch_config_pdu->harq_process_nbr;
-
- if (dl_config->dl_config_list[i].pdu_type == FAPI_NR_DL_CONFIG_TYPE_DLSCH){
- dlsch0 = PHY_vars_UE_g[module_id][cc_id]->dlsch[thread_id][0][0];
- }
- else if (dl_config->dl_config_list[i].pdu_type == FAPI_NR_DL_CONFIG_TYPE_RA_DLSCH){
+ switch(dl_config->dl_config_list[i].pdu_type) {
+ case FAPI_NR_DL_CONFIG_TYPE_DCI:
+ pdcch_config = &dl_config->dl_config_list[i].dci_config_pdu.dci_config_rel15;
+ memcpy(&pdcch_vars->pdcch_config[pdcch_vars->nb_search_space],pdcch_config,sizeof(*pdcch_config));
+ pdcch_vars->nb_search_space = pdcch_vars->nb_search_space + 1;
+ pdcch_vars->sfn = scheduled_response->frame;
+ pdcch_vars->slot = slot;
+ LOG_D(PHY,"Number of DCI SearchSpaces %d\n",pdcch_vars->nb_search_space);
+ break;
+ case FAPI_NR_DL_CONFIG_TYPE_CSI_IM:
+ LOG_I(PHY,"Received CSI-IM PDU at FAPI\n");
+ break;
+ case FAPI_NR_DL_CONFIG_TYPE_CSI_RS:
+ LOG_I(PHY,"Received CSI-RS PDU at FAPI\n");
+ break;
+ case FAPI_NR_DL_CONFIG_TYPE_RA_DLSCH:
+ dlsch_config_pdu = &dl_config->dl_config_list[i].dlsch_config_pdu.dlsch_config_rel15;
dlsch0 = PHY_vars_UE_g[module_id][cc_id]->dlsch_ra[0];
dlsch0->rnti_type = _RA_RNTI_;
- dlsch0->harq_processes[current_harq_pid]->status = ACTIVE;
- }
- else if (dl_config->dl_config_list[i].pdu_type == FAPI_NR_DL_CONFIG_TYPE_SI_DLSCH){
+ dlsch0->harq_processes[dlsch_config_pdu->harq_process_nbr]->status = ACTIVE;
+ configure_dlsch(dlsch0, dlsch_config_pdu, module_id,
+ dl_config->dl_config_list[i].dlsch_config_pdu.rnti);
+ break;
+ case FAPI_NR_DL_CONFIG_TYPE_SI_DLSCH:
+ dlsch_config_pdu = &dl_config->dl_config_list[i].dlsch_config_pdu.dlsch_config_rel15;
dlsch0 = PHY_vars_UE_g[module_id][cc_id]->dlsch_SI[0];
dlsch0->rnti_type = _SI_RNTI_;
- dlsch0->harq_processes[current_harq_pid]->status = ACTIVE;
- }
-
- dlsch0->current_harq_pid = current_harq_pid;
- dlsch0->active = 1;
- dlsch0->rnti = dl_config->dl_config_list[i].dlsch_config_pdu.rnti;
-
- LOG_D(PHY,"slot %d current_harq_pid = %d\n",slot, current_harq_pid);
-
- NR_DL_UE_HARQ_t *dlsch0_harq = dlsch0->harq_processes[current_harq_pid];
- if (dlsch0_harq){
-
- dlsch0_harq->BWPStart = dlsch_config_pdu->BWPStart;
- dlsch0_harq->BWPSize = dlsch_config_pdu->BWPSize;
- dlsch0_harq->nb_rb = dlsch_config_pdu->number_rbs;
- dlsch0_harq->start_rb = dlsch_config_pdu->start_rb;
- dlsch0_harq->nb_symbols = dlsch_config_pdu->number_symbols;
- dlsch0_harq->start_symbol = dlsch_config_pdu->start_symbol;
- dlsch0_harq->dlDmrsSymbPos = dlsch_config_pdu->dlDmrsSymbPos;
- dlsch0_harq->dmrsConfigType = dlsch_config_pdu->dmrsConfigType;
- dlsch0_harq->n_dmrs_cdm_groups = dlsch_config_pdu->n_dmrs_cdm_groups;
- dlsch0_harq->dmrs_ports = dlsch_config_pdu->dmrs_ports;
- dlsch0_harq->mcs = dlsch_config_pdu->mcs;
- dlsch0_harq->rvidx = dlsch_config_pdu->rv;
- dlsch0->g_pucch = dlsch_config_pdu->accumulated_delta_PUCCH;
- //get nrOfLayers from DCI info
- uint8_t Nl = 0;
- for (i = 0; i < 12; i++) { // max 12 ports
- if ((dlsch_config_pdu->dmrs_ports>>i)&0x01) Nl += 1;
- }
- dlsch0_harq->Nl = Nl;
- dlsch0_harq->mcs_table=dlsch_config_pdu->mcs_table;
- downlink_harq_process(dlsch0_harq, dlsch0->current_harq_pid, dlsch_config_pdu->ndi, dlsch_config_pdu->rv, dlsch0->rnti_type);
- if (dlsch0_harq->status != ACTIVE) {
- // dlsch0_harq->status not ACTIVE due to false retransmission
- // Reset the following flag to skip PDSCH procedures in that case and retrasmit harq status
- dlsch0->active = 0;
- update_harq_status(module_id,dlsch0->current_harq_pid,dlsch0_harq->ack);
- }
- /* PTRS */
- dlsch0_harq->PTRSFreqDensity = dlsch_config_pdu->PTRSFreqDensity;
- dlsch0_harq->PTRSTimeDensity = dlsch_config_pdu->PTRSTimeDensity;
- dlsch0_harq->PTRSPortIndex = dlsch_config_pdu->PTRSPortIndex;
- dlsch0_harq->nEpreRatioOfPDSCHToPTRS = dlsch_config_pdu->nEpreRatioOfPDSCHToPTRS;
- dlsch0_harq->PTRSReOffset = dlsch_config_pdu->PTRSReOffset;
- dlsch0_harq->pduBitmap = dlsch_config_pdu->pduBitmap;
- LOG_D(MAC, ">>>> \tdlsch0->g_pucch = %d\tdlsch0_harq.mcs = %d\n",
- dlsch0->g_pucch, dlsch0_harq->mcs);
- }
+ dlsch0->harq_processes[dlsch_config_pdu->harq_process_nbr]->status = ACTIVE;
+ configure_dlsch(dlsch0, dlsch_config_pdu, module_id,
+ dl_config->dl_config_list[i].dlsch_config_pdu.rnti);
+ break;
+ case FAPI_NR_DL_CONFIG_TYPE_DLSCH:
+ dlsch_config_pdu = &dl_config->dl_config_list[i].dlsch_config_pdu.dlsch_config_rel15;
+ dlsch0 = PHY_vars_UE_g[module_id][cc_id]->dlsch[thread_id][0][0];
+ configure_dlsch(dlsch0, dlsch_config_pdu, module_id,
+ dl_config->dl_config_list[i].dlsch_config_pdu.rnti);
+ break;
}
}
dl_config->number_pdus = 0;
@@ -322,9 +342,9 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
fapi_nr_ul_config_request_t *ul_config = scheduled_response->ul_config;
int pdu_done = 0;
pthread_mutex_lock(&ul_config->mutex_ul_config);
- LOG_D(PHY, "%d.%d ul S ul_config %p pdu_done %d number_pdus %d\n", scheduled_response->frame, slot, ul_config, pdu_done, ul_config->number_pdus);
- for (i = 0; i < ul_config->number_pdus; ++i){
+ LOG_D(PHY, "%d.%d ul S ul_config %p pdu_done %d number_pdus %d\n", scheduled_response->frame, slot, ul_config, pdu_done, ul_config->number_pdus);
+ for (int i = 0; i < ul_config->number_pdus; ++i){
AssertFatal(ul_config->ul_config_list[i].pdu_type <= FAPI_NR_UL_CONFIG_TYPES,"pdu_type %d out of bounds\n",ul_config->ul_config_list[i].pdu_type);
LOG_D(PHY, "In %s: processing %s PDU of %d total UL PDUs (ul_config %p) \n", __FUNCTION__, ul_pdu_type[ul_config->ul_config_list[i].pdu_type - 1], ul_config->number_pdus, ul_config);
diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
index 996ee2538c833703c3ca2c8f774a7e112c78c4f3..0d284de71c4541df679fa05b376e207cd1616138 100644
--- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -576,6 +576,7 @@ int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int gNB_
get_dmrs_port(aatx,dlsch0_harq->dmrs_ports),
m,
BWPStart,
+ dlsch0_harq->dmrsConfigType,
ue->frame_parms.first_carrier_offset+(BWPStart + pdsch_start_rb)*12,
pdsch_nb_rb);
#if 0
@@ -610,7 +611,7 @@ int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int gNB_
dual_stream_UE = 0;
gNB_id_i = gNB_id+1;
i_mod = 0;
- if (( m==first_symbol_with_data ) && (m<4))
+ if (m==first_symbol_with_data)
first_symbol_flag = 1;
else
first_symbol_flag = 0;
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c
index c1443700f331362add8263ef43c598f9ed6eb282..495b6803a64086f3b60b9cd153b948c7ec0e5883 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim.c
@@ -64,6 +64,13 @@
void feptx_ofdm(RU_t *ru, int frame, int subframe);
void feptx_prec(RU_t *ru, int frame, int subframe);
+const char *__asan_default_options()
+{
+ /* don't do leak checking in nr_ulsim, not finished yet */
+ return "detect_leaks=0";
+}
+
+
double cpuf;
#define inMicroS(a) (((double)(a))/(get_cpu_freq_GHz()*1000.0))
//#define MCS_COUNT 23//added for PHY abstraction
@@ -140,7 +147,7 @@ void do_OFDM_mod_l(int32_t **txdataF, int32_t **txdata, uint16_t next_slot, LTE_
}
void DL_channel(RU_t *ru,PHY_VARS_UE *UE,uint subframe,int awgn_flag,double SNR, int tx_lev,int hold_channel,int abstx, int num_rounds, int trials, int round, channel_desc_t *eNB2UE[4],
- double *s_re[2],double *s_im[2],double *r_re[2],double *r_im[2],FILE *csv_fd) {
+ double *s_re[NB_ANTENNAS_TX],double *s_im[NB_ANTENNAS_TX],double *r_re[NB_ANTENNAS_RX],double *r_im[NB_ANTENNAS_RX],FILE *csv_fd) {
int i,u;
int aa,aarx,aatx;
double channelx,channely;
@@ -1538,9 +1545,9 @@ int main(int argc, char **argv) {
LOG_M("txsig0.m","txs0", &ru->common.txdata[0][subframe* eNB->frame_parms.samples_per_tti], eNB->frame_parms.samples_per_tti,1,1);
if (transmission_mode<7) {
- LOG_M("txsigF0.m","txsF0x", &ru->common.txdataF_BF[0][subframe*nsymb*eNB->frame_parms.ofdm_symbol_size],nsymb*eNB->frame_parms.ofdm_symbol_size,1,1);
+ LOG_M("txsigF0.m","txsF0x", &ru->common.txdataF_BF[0][0],nsymb*eNB->frame_parms.ofdm_symbol_size,1,1);
} else if (transmission_mode == 7) {
- LOG_M("txsigF0.m","txsF0", &ru->common.txdataF_BF[5][subframe*nsymb*eNB->frame_parms.ofdm_symbol_size],nsymb*eNB->frame_parms.ofdm_symbol_size,1,1);
+ LOG_M("txsigF0.m","txsF0", &ru->common.txdataF_BF[5][0],nsymb*eNB->frame_parms.ofdm_symbol_size,1,1);
LOG_M("txsigF0_BF.m","txsF0_BF", &ru->common.txdataF_BF[0][0],eNB->frame_parms.ofdm_symbol_size,1,1);
}
}
diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c
index 1b1058535e6fc6d77c931d37e0bd6dfc9aed1d2b..a1894d03d7384f6650723cd3b5f73635a09b429c 100644
--- a/openair1/SIMULATION/LTE_PHY/ulsim.c
+++ b/openair1/SIMULATION/LTE_PHY/ulsim.c
@@ -58,6 +58,12 @@
#include "common/ran_context.h"
#include "PHY/LTE_ESTIMATION/lte_estimation.h"
+const char *__asan_default_options()
+{
+ /* don't do leak checking in ulsim, not finished yet */
+ return "detect_leaks=0";
+}
+
double cpuf;
#define inMicroS(a) (((double)(a))/(get_cpu_freq_GHz()*1000.0))
//#define MCS_COUNT 23//added for PHY abstraction
@@ -334,10 +340,10 @@ int main(int argc, char **argv) {
double s_re1[30720],s_im1[30720],r_re1[30720],r_im1[30720];
double r_re2[30720],r_im2[30720];
double r_re3[30720],r_im3[30720];
- double *s_re[2]= {s_re0,s_re1};
- double *s_im[2]= {s_im0,s_im1};
- double *r_re[4]= {r_re0,r_re1,r_re2,r_re3};
- double *r_im[4]= {r_im0,r_im1,r_im2,r_im3};
+ double *s_re[NB_ANTENNAS_TX]= {s_re0,s_re1, NULL, NULL};
+ double *s_im[NB_ANTENNAS_TX]= {s_im0,s_im1, NULL, NULL};
+ double *r_re[NB_ANTENNAS_RX]= {r_re0,r_re1,r_re2,r_re3};
+ double *r_im[NB_ANTENNAS_RX]= {r_im0,r_im1,r_im2,r_im3};
double forgetting_factor=0.0; //in [0,1] 0 means a new channel every time, 1 means keep the same channel
double iqim=0.0;
int cqi_error,cqi_errors,ack_errors,cqi_crc_falsepositives,cqi_crc_falsenegatives;
diff --git a/openair1/SIMULATION/NR_PHY/dlschsim.c b/openair1/SIMULATION/NR_PHY/dlschsim.c
index f566b93d9c31c138eb4351aabac30309f1ce60ed..f3aae9a3f7b452cbbd034e1d649e6680a875ce8e 100644
--- a/openair1/SIMULATION/NR_PHY/dlschsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlschsim.c
@@ -29,6 +29,7 @@
#include "common/config/config_userapi.h"
#include "common/utils/LOG/log.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
+#include "common/utils/load_module_shlib.h"
#include "T.h"
#include "PHY/defs_gNB.h"
#include "PHY/defs_nr_common.h"
@@ -355,7 +356,7 @@ int main(int argc, char **argv)
}
RC.gNB = (PHY_VARS_gNB **) malloc(sizeof(PHY_VARS_gNB *));
- RC.gNB[0] = malloc(sizeof(PHY_VARS_gNB));
+ RC.gNB[0] = calloc(1, sizeof(PHY_VARS_gNB));
gNB = RC.gNB[0];
gNB->threadPool = (tpool_t*)malloc(sizeof(tpool_t));
initTpool(gNBthreads, gNB->threadPool, true);
@@ -412,7 +413,7 @@ int main(int argc, char **argv)
memcpy(&UE->frame_parms, frame_parms, sizeof(NR_DL_FRAME_PARMS));
//phy_init_nr_top(frame_parms);
- if (init_nr_ue_signal(UE, 1, 0) != 0) {
+ if (init_nr_ue_signal(UE, 1) != 0) {
printf("Error at UE NR initialisation\n");
exit(-1);
}
@@ -421,8 +422,7 @@ int main(int argc, char **argv)
//init_nr_ue_transport(UE, 0);
for (int sf = 0; sf < 2; sf++) {
for (i = 0; i < 2; i++) {
- UE->dlsch[sf][0][i] = new_nr_ue_dlsch(Kmimo, 8, Nsoft, 5, N_RB_DL,
- 0);
+ UE->dlsch[sf][0][i] = new_nr_ue_dlsch(Kmimo, 8, Nsoft, 5, N_RB_DL);
if (!UE->dlsch[sf][0][i]) {
printf("Can't get ue dlsch structures\n");
@@ -433,8 +433,6 @@ int main(int argc, char **argv)
}
}
- UE->dlsch_SI[0] = new_nr_ue_dlsch(1, 1, Nsoft, 5, N_RB_DL, 0);
- UE->dlsch_ra[0] = new_nr_ue_dlsch(1, 1, Nsoft, 5, N_RB_DL, 0);
unsigned char harq_pid = 0; //dlsch->harq_ids[subframe];
processingData_L1tx_t msgDataTx;
init_DLSCH_struct(gNB, &msgDataTx);
@@ -472,16 +470,13 @@ int main(int argc, char **argv)
rel15->dlDmrsSymbPos = 4;
rel15->mcsIndex[0] = Imcs;
rel15->numDmrsCdmGrpsNoData = 1;
- double *modulated_input = malloc16(sizeof(double) * 16 * 68 * 384); // [hna] 16 segments, 68*Zc
- short *channel_output_fixed = malloc16(sizeof(short) * 16 * 68 * 384);
- short *channel_output_uncoded = malloc16(sizeof(unsigned short) * 16 * 68 * 384);
+ double modulated_input[16 * 68 * 384]; // [hna] 16 segments, 68*Zc
+ short channel_output_fixed[16 * 68 * 384];
//unsigned char *estimated_output;
- unsigned char *estimated_output_bit;
- unsigned char *test_input_bit;
unsigned int errors_bit = 0;
- test_input_bit = (unsigned char *) malloc16(sizeof(unsigned char) * 16 * 68 * 384);
+ unsigned char test_input_bit[16 * 68 * 384];
//estimated_output = (unsigned char *) malloc16(sizeof(unsigned char) * 16 * 68 * 384);
- estimated_output_bit = (unsigned char *) malloc16(sizeof(unsigned char) * 16 * 68 * 384);
+ unsigned char estimated_output_bit[16 * 68 * 384];
NR_UE_DLSCH_t *dlsch0_ue = UE->dlsch[0][0][0];
NR_DL_UE_HARQ_t *harq_process = dlsch0_ue->harq_processes[harq_pid];
harq_process->mcs = Imcs;
@@ -495,9 +490,10 @@ int main(int argc, char **argv)
harq_process->dlDmrsSymbPos = 4;
harq_process->n_dmrs_cdm_groups = 1;
printf("harq process ue mcs = %d Qm = %d, symb %d\n", harq_process->mcs, harq_process->Qm, nb_symb_sch);
+
unsigned char *test_input;
test_input = (unsigned char *) malloc16(sizeof(unsigned char) * TBS / 8);
-
+ //unsigned char test_input[TBS / 8] __attribute__ ((aligned(16)));
for (i = 0; i < TBS / 8; i++)
test_input[i] = (unsigned char) rand();
@@ -554,12 +550,6 @@ int main(int argc, char **argv)
i,modulated_input[i],
i,channel_output_fixed[i]);
*/
-
- //Uncoded BER
- if (channel_output_fixed[i] < 0)
- channel_output_uncoded[i] = 1; //QPSK demod
- else
- channel_output_uncoded[i] = 0;
}
#ifdef DEBUG_CODER
@@ -641,12 +631,22 @@ int main(int argc, char **argv)
}
}*/
- for (i = 0; i < 2; i++) {
- printf("gNB %d\n", i);
- free_gNB_dlsch(&(msgDataTx.dlsch[0][i]),N_RB_DL);
- printf("UE %d\n", i);
- free_nr_ue_dlsch(&(UE->dlsch[0][0][i]),N_RB_DL);
- }
+ free(test_input);
+
+ free_channel_desc_scm(gNB2UE);
+
+ reset_DLSCH_struct(gNB, &msgDataTx);
+
+ phy_free_nr_gNB(gNB);
+ free(gNB->threadPool);
+ free(RC.gNB[0]);
+ free(RC.gNB);
+
+ for (int sf = 0; sf < 2; sf++)
+ for (int i = 0; i < 2; i++)
+ free_nr_ue_dlsch(&UE->dlsch[sf][0][i], N_RB_DL);
+ term_nr_ue_signal(UE, 1);
+ free(UE);
for (i = 0; i < 2; i++) {
free(s_re[i]);
@@ -671,6 +671,9 @@ int main(int argc, char **argv)
if (ouput_vcd)
vcd_signal_dumper_close();
+ loader_reset();
+ logTerm();
+
return (n_errors);
}
diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c
index dcc01c2e3cc8603d388c3d1efef5cd16be187d44..de91306c591fd17774c505fd817272535ce88354 100644
--- a/openair1/SIMULATION/NR_PHY/dlsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlsim.c
@@ -73,6 +73,12 @@
#include <executables/softmodem-common.h>
#include <openair3/ocp-gtpu/gtp_itf.h>
+const char *__asan_default_options()
+{
+ /* don't do leak checking in nr_ulsim, not finished yet */
+ return "detect_leaks=0";
+}
+
LCHAN_DESC DCCH_LCHAN_DESC,DTCH_DL_LCHAN_DESC,DTCH_UL_LCHAN_DESC;
rlc_info_t Rlc_info_um,Rlc_info_am_config;
@@ -175,7 +181,12 @@ gtpv1u_update_ngu_tunnel(
return 0;
}
-int ocp_gtpv1u_delete_s1u_tunnel(const instance_t instance, const gtpv1u_enb_delete_tunnel_req_t *const req_pP) {
+int gtpv1u_delete_s1u_tunnel(const instance_t instance, const gtpv1u_enb_delete_tunnel_req_t *const req_pP) {
+ return 0;
+}
+
+int gtpv1u_delete_ngu_tunnel( const instance_t instance,
+ gtpv1u_gnb_delete_tunnel_req_t *req) {
return 0;
}
@@ -773,7 +784,8 @@ int main(int argc, char **argv)
prepare_scd(scd);
- fill_default_secondaryCellGroup(scc, scd, secondaryCellGroup, 0, 1, n_tx, 6, 0, 0, 0, 0);
+ fill_default_secondaryCellGroup(scc, scd, secondaryCellGroup, 0, 1, n_tx, 6, 0, 0, 0);
+
/* RRC parameter validation for secondaryCellGroup */
fix_scd(scd);
@@ -792,9 +804,9 @@ int main(int argc, char **argv)
AssertFatal((gNB->if_inst = NR_IF_Module_init(0))!=NULL,"Cannot register interface");
gNB->if_inst->NR_PHY_config_req = nr_phy_config_request;
// common configuration
- rrc_mac_config_req_gNB(0,0, n_tx, n_tx, 0, scc, NULL, 0, 0, NULL);
+ rrc_mac_config_req_gNB(0,0, n_tx, n_tx, 0, 6, scc, NULL, 0, 0, NULL);
// UE dedicated configuration
- rrc_mac_config_req_gNB(0,0, n_tx, n_tx, 0, scc, NULL, 1, secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity,secondaryCellGroup);
+ rrc_mac_config_req_gNB(0,0, n_tx, n_tx, 0, 6, scc, NULL, 1, secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity,secondaryCellGroup);
// reset preprocessor to the one of DLSIM after it has been set during
// rrc_mac_config_req_gNB
gNB_mac->pre_processor_dl = nr_dlsim_preprocessor;
@@ -911,16 +923,25 @@ int main(int argc, char **argv)
UE->perfect_ce = 0;
- if (init_nr_ue_signal(UE, 1, 0) != 0)
+ if (init_nr_ue_signal(UE, 1) != 0)
{
printf("Error at UE NR initialisation\n");
exit(-1);
}
- init_nr_ue_transport(UE,0);
+ init_nr_ue_transport(UE);
nr_gold_pbch(UE);
- nr_gold_pdcch(UE,0);
+
+ // compute the scramblingID_pdcch and the gold pdcch
+ UE->scramblingID_pdcch = frame_parms->Nid_cell;
+ nr_gold_pdcch(UE, frame_parms->Nid_cell);
+
+ // compute the scrambling IDs for PDSCH DMRS
+ for (int i = 0; i < 2; i++)
+ UE->scramblingID[i] = frame_parms->Nid_cell;
+
+ nr_gold_pdsch(UE, UE->scramblingID);
nr_l2_init_ue(NULL);
UE_mac = get_mac_inst(0);
diff --git a/openair1/SIMULATION/NR_PHY/pbchsim.c b/openair1/SIMULATION/NR_PHY/pbchsim.c
index c6b547cd79b4346dac610adfbde956497c5aa069..f3a8d21fdde53172148dd76f40b2d0926b43b3e9 100644
--- a/openair1/SIMULATION/NR_PHY/pbchsim.c
+++ b/openair1/SIMULATION/NR_PHY/pbchsim.c
@@ -27,6 +27,7 @@
#include <sys/mman.h>
#include "common/config/config_userapi.h"
#include "common/utils/LOG/log.h"
+#include "common/utils/load_module_shlib.h"
#include "common/ran_context.h"
#include "common/utils/nr/nr_common.h"
#include "PHY/types.h"
@@ -202,15 +203,15 @@ int main(int argc, char **argv)
float target_error_rate = 0.01;
+ int seed = 0;
+
cpuf = get_cpu_freq_GHz();
if ( load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY) == 0) {
exit_fun("[NR_PBCHSIM] Error, configuration module init failed\n");
}
- randominit(0);
-
- while ((c = getopt (argc, argv, "f:hA:pf:g:i:j:n:o:s:S:t:x:y:z:M:N:F:GR:dP:IL:m:")) != -1) {
+ while ((c = getopt (argc, argv, "F:g:hIL:m:M:n:N:o:P:r:R:s:S:x:y:z:")) != -1) {
switch (c) {
/*case 'f':
write_output_file=1;
@@ -227,6 +228,14 @@ int main(int argc, char **argv)
frame_type = 1;
break;*/
+ case 'F':
+ input_fd = fopen(optarg,"r");
+ if (input_fd==NULL) {
+ printf("Problem with filename %s. Exiting.\n", optarg);
+ exit(-1);
+ }
+ break;
+
case 'g':
switch((char)*optarg) {
case 'A':
@@ -264,18 +273,42 @@ int main(int argc, char **argv)
break;
- /*case 'i':
+ /*
+ case 'i':
interf1=atoi(optarg);
break;
+ */
+ case 'I':
+ run_initial_sync=1;
+ target_error_rate=0.1;
+ break;
+
+ /*
case 'j':
interf2=atoi(optarg);
break;*/
+ case 'L':
+ loglvl = atoi(optarg);
+ break;
+
+ case 'm':
+ mu = atoi(optarg);
+ break;
+
+ case 'M':
+ SSB_positions = atoi(optarg);
+ break;
+
case 'n':
n_trials = atoi(optarg);
break;
+ case 'N':
+ Nid_cell = atoi(optarg);
+ break;
+
case 'o':
cfo = atof(optarg);
#ifdef DEBUG_NR_PBCHSIM
@@ -283,6 +316,34 @@ int main(int argc, char **argv)
#endif
break;
+ /*case 'p':
+ extended_prefix_flag=1;
+ break;*/
+
+ case 'P':
+ pbch_phase = atoi(optarg);
+ if (pbch_phase>3)
+ printf("Illegal PBCH phase (0-3) got %d\n",pbch_phase);
+ break;
+
+ /*
+ case 'r':
+ ricean_factor = pow(10,-.1*atof(optarg));
+ if (ricean_factor>1) {
+ printf("Ricean factor must be between 0 and 1\n");
+ exit(-1);
+ }
+ break;
+ */
+
+ case 'r':
+ seed = atoi(optarg);
+ break;
+
+ case 'R':
+ N_RB_DL = atoi(optarg);
+ break;
+
case 's':
snr0 = atof(optarg);
#ifdef DEBUG_NR_PBCHSIM
@@ -303,19 +364,7 @@ int main(int argc, char **argv)
Td= atof(optarg);
break;
*/
- /*case 'p':
- extended_prefix_flag=1;
- break;*/
- /*
- case 'r':
- ricean_factor = pow(10,-.1*atof(optarg));
- if (ricean_factor>1) {
- printf("Ricean factor must be between 0 and 1\n");
- exit(-1);
- }
- break;
- */
case 'x':
transmission_mode=atoi(optarg);
@@ -328,99 +377,58 @@ int main(int argc, char **argv)
case 'y':
n_tx=atoi(optarg);
-
if ((n_tx==0) || (n_tx>2)) {
- printf("Unsupported number of TX antennas %d. Exiting.\n", n_tx);
+ printf("Unsupported number of TX antennas %d. Exiting.\n", n_tx);
exit(-1);
}
-
break;
case 'z':
n_rx=atoi(optarg);
-
if ((n_rx==0) || (n_rx>2)) {
- printf("Unsupported number of RX antennas %d. Exiting.\n", n_rx);
- exit(-1);
- }
-
- break;
-
- case 'M':
- SSB_positions = atoi(optarg);
- break;
-
- case 'N':
- Nid_cell = atoi(optarg);
- break;
-
- case 'R':
- N_RB_DL = atoi(optarg);
- break;
-
- case 'F':
- input_fd = fopen(optarg,"r");
-
- if (input_fd==NULL) {
- printf("Problem with filename %s. Exiting.\n", optarg);
+ printf("Unsupported number of RX antennas %d. Exiting.\n", n_rx);
exit(-1);
}
-
- break;
-
- case 'P':
- pbch_phase = atoi(optarg);
-
- if (pbch_phase>3)
- printf("Illegal PBCH phase (0-3) got %d\n",pbch_phase);
-
- break;
-
- case 'I':
- run_initial_sync=1;
- target_error_rate=0.1;
- break;
-
- case 'L':
- loglvl = atoi(optarg);
- break;
-
- case 'm':
- mu = atoi(optarg);
break;
default:
case 'h':
- printf("%s -h(elp) -p(extended_prefix) -N cell_id -f output_filename -F input_filename -g channel_model -n n_frames -t Delayspread -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant -i Intefrence0 -j Interference1 -A interpolation_file -C(alibration offset dB) -N CellId\n",
+ printf("%s -F input_filename -g channel_mod -h(elp) -I(nitial sync) -L log_lvl -n n_frames -M SSBs -n frames -N cell_id -o FO -P phase -r seed -R RBs -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant\n",
argv[0]);
- printf("-h This message\n");
- //printf("-p Use extended prefix mode\n");
+ //printf("-A Interpolation_filname Run with Abstraction to generate Scatter plot using interpolation polynomial in file\n");
+ //printf("-C Generate Calibration information for Abstraction (effective SNR adjustment to remove Pe bias w.r.t. AWGN)\n");
//printf("-d Use TDD\n");
- printf("-n Number of frames to simulate\n");
- printf("-m Numerology index\n");
- printf("-s Starting SNR, runs from SNR0 to SNR0 + 5 dB. If n_frames is 1 then just SNR is simulated\n");
- printf("-S Ending SNR, runs from SNR0 to SNR1\n");
- printf("-t Delay spread for multipath channel\n");
+ //printf("-f Output filename (.txt format) for Pe/SNR results\n");
+ printf("-F Input filename (.txt format) for RX conformance testing\n");
printf("-g [A,B,C,D,E,F,G] Use 3GPP SCM (A,B,C,D) or 36-101 (E-EPA,F-EVA,G-ETU) models (ignores delay spread and Ricean factor)\n");
- printf("-x Transmission mode (1,2,6 for the moment)\n");
- printf("-y Number of TX antennas used in eNB\n");
- printf("-z Number of RX antennas used in UE\n");
+ printf("-h This message\n");
//printf("-i Relative strength of first intefering eNB (in dB) - cell_id mod 3 = 1\n");
+ printf("-I run initial sync with target error rate 0.1\n");
//printf("-j Relative strength of second intefering eNB (in dB) - cell_id mod 3 = 2\n");
- printf("-o Carrier frequency offset in Hz\n");
+ printf("-L set the log level (-1 disable, 0 error, 1 warning, 2 info, 3 debug, 4 trace)\n");
+ printf("-m Numerology index\n");
printf("-M Multiple SSB positions in burst\n");
+ printf("-n Number of frames to simulate\n");
printf("-N Nid_cell\n");
+ printf("-o Carrier frequency offset in Hz\n");
+ //printf("-O oversampling factor (1,2,4,8,16)\n");
+ //printf("-p Use extended prefix mode\n");
+ printf("-P PBCH phase, allowed values 0-3\n");
+ printf("-r set the random number generator seed (default: 0 = current time)\n");
printf("-R N_RB_DL\n");
- printf("-O oversampling factor (1,2,4,8,16)\n");
- printf("-A Interpolation_filname Run with Abstraction to generate Scatter plot using interpolation polynomial in file\n");
- //printf("-C Generate Calibration information for Abstraction (effective SNR adjustment to remove Pe bias w.r.t. AWGN)\n");
- //printf("-f Output filename (.txt format) for Pe/SNR results\n");
- printf("-F Input filename (.txt format) for RX conformance testing\n");
+ printf("-s Starting SNR, runs from SNR0 to SNR0 + 10 dB if not -S given. If -n 1, then just SNR is simulated\n");
+ printf("-S Ending SNR, runs from SNR0 to SNR1\n");
+ //printf("-t Delay spread for multipath channel\n");
+ printf("-x Transmission mode (1,2,6 for the moment)\n");
+ printf("-y Number of TX antennas used in eNB\n");
+ printf("-z Number of RX antennas used in UE\n");
exit (-1);
break;
}
}
+ randominit(seed);
+
logInit();
set_glog(loglvl);
T_stdout = 1;
@@ -431,12 +439,13 @@ int main(int argc, char **argv)
printf("Initializing gNodeB for mu %d, N_RB_DL %d\n",mu,N_RB_DL);
RC.gNB = (PHY_VARS_gNB**) malloc(sizeof(PHY_VARS_gNB *));
- RC.gNB[0] = malloc(sizeof(PHY_VARS_gNB));
+ RC.gNB[0] = malloc16_clear(sizeof(*(RC.gNB[0])));
gNB = RC.gNB[0];
gNB->ofdm_offset_divisor = UINT_MAX;
frame_parms = &gNB->frame_parms; //to be initialized I suppose (maybe not necessary for PBCH)
frame_parms->nb_antennas_tx = n_tx;
frame_parms->nb_antennas_rx = n_rx;
+ frame_parms->nb_antenna_ports_gNB = n_tx;
frame_parms->N_RB_DL = N_RB_DL;
frame_parms->Nid_cell = Nid_cell;
frame_parms->nushift = Nid_cell%4;
@@ -526,19 +535,13 @@ int main(int argc, char **argv)
for (i=0; i<2; i++) {
- s_re[i] = malloc(frame_length_complex_samples*sizeof(double));
- bzero(s_re[i],frame_length_complex_samples*sizeof(double));
- s_im[i] = malloc(frame_length_complex_samples*sizeof(double));
- bzero(s_im[i],frame_length_complex_samples*sizeof(double));
-
- r_re[i] = malloc(frame_length_complex_samples*sizeof(double));
- bzero(r_re[i],frame_length_complex_samples*sizeof(double));
- r_im[i] = malloc(frame_length_complex_samples*sizeof(double));
- bzero(r_im[i],frame_length_complex_samples*sizeof(double));
+ s_re[i] = malloc16_clear(frame_length_complex_samples*sizeof(double));
+ s_im[i] = malloc16_clear(frame_length_complex_samples*sizeof(double));
+ r_re[i] = malloc16_clear(frame_length_complex_samples*sizeof(double));
+ r_im[i] = malloc16_clear(frame_length_complex_samples*sizeof(double));
printf("Allocating %d samples for txdata\n",frame_length_complex_samples);
- txdata[i] = malloc(frame_length_complex_samples*sizeof(int));
- bzero(r_re[i],frame_length_complex_samples*sizeof(int));
+ txdata[i] = malloc16_clear(frame_length_complex_samples*sizeof(int));
}
if (pbch_file_fd!=NULL) {
@@ -547,8 +550,8 @@ int main(int argc, char **argv)
//configure UE
- UE = malloc(sizeof(PHY_VARS_NR_UE));
- memcpy(&UE->frame_parms,frame_parms,sizeof(NR_DL_FRAME_PARMS));
+ UE = malloc16_clear(sizeof(*UE));
+ memcpy(&UE->frame_parms,frame_parms,sizeof(UE->frame_parms));
//phy_init_nr_top(UE); //called from init_nr_ue_signal
if (run_initial_sync==1) UE->is_synchronized = 0;
else UE->is_synchronized = 1;
@@ -558,7 +561,7 @@ int main(int argc, char **argv)
if(eps!=0.0)
UE->UE_fo_compensation = 1; // if a frequency offset is set then perform fo estimation and compensation
- if (init_nr_ue_signal(UE, 1, 0) != 0) {
+ if (init_nr_ue_signal(UE, 1) != 0) {
printf("Error at UE NR initialisation\n");
exit(-1);
}
@@ -654,13 +657,6 @@ int main(int argc, char **argv)
frame_parms->ofdm_symbol_size + frame_parms->nb_prefix_samples);
printf("txlev %d (%f)\n",txlev,10*log10(txlev));*/
-
- for (i=0; i<frame_length_complex_samples; i++) {
- for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
- r_re[aa][i] = ((double)(((short *)txdata[aa]))[(i<<1)]);
- r_im[aa][i] = ((double)(((short *)txdata[aa]))[(i<<1)+1]);
- }
- }
for (SNR=snr0; SNR<snr1; SNR+=.2) {
@@ -668,6 +664,14 @@ int main(int argc, char **argv)
n_errors_payload = 0;
for (trial=0; trial<n_trials; trial++) {
+
+ for (i=0; i<frame_length_complex_samples; i++) {
+ for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
+ r_re[aa][i] = ((double)(((short *)txdata[aa]))[(i<<1)]);
+ r_im[aa][i] = ((double)(((short *)txdata[aa]))[(i<<1)+1]);
+ }
+ }
+
// multipath channel
//multipath_channel(gNB2UE,s_re,s_im,r_re,r_im,frame_length_complex_samples,0);
@@ -696,13 +700,11 @@ int main(int argc, char **argv)
0.0, // IQ imbalance (dB),
0.0); // IQ phase imbalance (rad)
-
for (i=0; i<frame_length_complex_samples; i++) {
- for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
-
- ((short*) UE->common_vars.rxdata[aa])[2*i] = (short) ((r_re[aa][i] + sqrt(sigma2/2)*gaussdouble(0.0,1.0)));
- ((short*) UE->common_vars.rxdata[aa])[2*i+1] = (short) ((r_im[aa][i] + sqrt(sigma2/2)*gaussdouble(0.0,1.0)));
- }
+ for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
+ ((short*) UE->common_vars.rxdata[aa])[2*i] = (short) ((r_re[aa][i] + sqrt(sigma2/2)*gaussdouble(0.0,1.0)));
+ ((short*) UE->common_vars.rxdata[aa])[2*i+1] = (short) ((r_im[aa][i] + sqrt(sigma2/2)*gaussdouble(0.0,1.0)));
+ }
}
if (n_trials==1) {
@@ -774,6 +776,15 @@ int main(int argc, char **argv)
} // NSR
+ free_channel_desc_scm(gNB2UE);
+
+ phy_free_nr_gNB(gNB);
+ free(RC.gNB[0]);
+ free(RC.gNB);
+
+ term_nr_ue_signal(UE, 1);
+ free(UE);
+
for (i=0; i<2; i++) {
free(s_re[i]);
free(s_im[i]);
@@ -794,6 +805,9 @@ int main(int argc, char **argv)
if (input_fd)
fclose(input_fd);
+ loader_reset();
+ logTerm();
+
return(n_errors);
}
diff --git a/openair1/SIMULATION/NR_PHY/prachsim.c b/openair1/SIMULATION/NR_PHY/prachsim.c
index fb0f37d7ac6665e3a1ab6d39f9fbf1bdb72b1b53..bc4f4a0b60a33b22bc59b911628c9d3646890d68 100644
--- a/openair1/SIMULATION/NR_PHY/prachsim.c
+++ b/openair1/SIMULATION/NR_PHY/prachsim.c
@@ -25,6 +25,7 @@
#include <pthread.h>
#include "common/config/config_userapi.h"
+#include "common/utils/load_module_shlib.h"
#include "common/utils/LOG/log.h"
#include "common/ran_context.h"
@@ -72,13 +73,11 @@ openair0_config_t openair0_cfg[MAX_CARDS];
uint64_t downlink_frequency[MAX_NUM_CCs][4];
int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
uint16_t sl_ahead = 0;
-msc_interface_t msc_interface;
uint32_t N_RB_DL = 106;
//void dump_nr_prach_config(NR_DL_FRAME_PARMS *frame_parms,uint8_t subframe);
/* temporary dummy implem of get_softmodem_optmask, till basic simulators implemented as device */
-msc_interface_t msc_interface;
uint64_t get_softmodem_optmask(void) {return 0;}
softmodem_params_t *get_softmodem_params(void) {return 0;}
int oai_nfapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req) { return(0); }
@@ -143,7 +142,12 @@ gtpv1u_update_ngu_tunnel(
return 0;
}
-int ocp_gtpv1u_delete_s1u_tunnel(const instance_t instance, const gtpv1u_enb_delete_tunnel_req_t *const req_pP) {
+int gtpv1u_delete_s1u_tunnel(const instance_t instance, const gtpv1u_enb_delete_tunnel_req_t *const req_pP) {
+ return 0;
+}
+
+int gtpv1u_delete_ngu_tunnel( const instance_t instance,
+ gtpv1u_gnb_delete_tunnel_req_t *req) {
return 0;
}
@@ -659,7 +663,6 @@ int main(int argc, char **argv){
RC.nb_nr_L1_inst=1;
phy_init_nr_gNB(gNB,0,1); //lowmem
nr_phy_init_RU(ru);
- gNB->common_vars.rxdata = ru->common.rxdata;
set_tdd_config_nr(&gNB->gNB_config, mu, 7, 6, 2, 4);
// Configure UE
@@ -671,7 +674,7 @@ int main(int argc, char **argv){
memcpy(&UE->frame_parms,frame_parms,sizeof(NR_DL_FRAME_PARMS));
UE->nrUE_config.prach_config.num_prach_fd_occasions_list = (fapi_nr_num_prach_fd_occasions_t *) malloc(num_prach_fd_occasions*sizeof(fapi_nr_num_prach_fd_occasions_t));
- if (init_nr_ue_signal(UE, 1, 0) != 0){
+ if (init_nr_ue_signal(UE, 1) != 0){
printf("Error at UE NR initialisation\n");
exit(-1);
}
@@ -778,7 +781,7 @@ int main(int argc, char **argv){
// multipath channel
// dump_nr_prach_config(&gNB->frame_parms,subframe);
- for (i = 0; i < frame_parms->samples_per_subframe<<1; i++) {
+ for (i = 0; i < frame_parms->samples_per_subframe; i++) {
for (aa=0; aa<1; aa++) {
if (awgn_flag == 0) {
s_re[aa][i] = ((double)(((short *)&txdata[aa][prach_start]))[(i<<1)]);
@@ -876,7 +879,8 @@ int main(int argc, char **argv){
rx_nr_prach_ru(ru, prach_format, numRA, prachStartSymbol, prachOccasion, frame, slot);
- gNB->prach_vars.rxsigF = ru->prach_rxsigF[prachOccasion];
+ for (int i = 0; i < ru->nb_rx; ++i)
+ gNB->prach_vars.rxsigF[i] = ru->prach_rxsigF[prachOccasion][i];
if (n_frames == 1) printf("ncs %d,num_seq %d\n",prach_pdu->num_cs, prach_config->num_prach_fd_occasions_list[fd_occasion].num_root_sequences.value);
rx_nr_prach(gNB, prach_pdu, prachOccasion, frame, subframe, &preamble_rx, &preamble_energy, &preamble_delay);
@@ -894,7 +898,7 @@ int main(int argc, char **argv){
#ifdef NR_PRACH_DEBUG
LOG_M("prach0.m","prach0", &txdata[0][prach_start], frame_parms->samples_per_subframe, 1, 1);
LOG_M("prachF0.m","prachF0", &gNB->prach_vars.prachF[0], N_ZC, 1, 1);
- LOG_M("rxsig0.m","rxs0", &gNB->common_vars.rxdata[0][subframe*frame_parms->samples_per_subframe], frame_parms->samples_per_subframe, 1, 1);
+ LOG_M("rxsig0.m","rxs0", &ru->common.rxdata[0][subframe*frame_parms->samples_per_subframe], frame_parms->samples_per_subframe, 1, 1);
LOG_M("ru_rxsig0.m","rxs0", &ru->common.rxdata[0][subframe*frame_parms->samples_per_subframe], frame_parms->samples_per_subframe, 1, 1);
LOG_M("ru_rxsigF0.m","rxsF0", ru->common.rxdataF[0], frame_parms->ofdm_symbol_size*frame_parms->symbols_per_slot, 1, 1);
LOG_M("ru_prach_rxsigF0.m","rxsF0", ru->prach_rxsigF[0][0], N_ZC, 1, 1);
@@ -919,6 +923,28 @@ int main(int argc, char **argv){
break;
} //SNR loop
+ free_channel_desc_scm(UE2gNB);
+
+ nr_phy_free_RU(ru);
+ free(RC.ru[0]);
+ free(RC.ru);
+
+ phy_free_nr_gNB(gNB);
+ // allocated in set_tdd_config_nr()
+ int nb_slots_to_set = TDD_CONFIG_NB_FRAMES*(1<<mu)*NR_NUMBER_OF_SUBFRAMES_PER_FRAME;
+ free(gNB->gNB_config.prach_config.num_prach_fd_occasions_list);
+ for (int i = 0; i < nb_slots_to_set; ++i)
+ free(gNB->gNB_config.tdd_table.max_tdd_periodicity_list[i].max_num_of_symbol_per_slot_list);
+ free(gNB->gNB_config.tdd_table.max_tdd_periodicity_list);
+ free(RC.gNB[0]);
+ free(RC.gNB);
+
+ term_nr_ue_signal(UE, 1);
+ free(UE->nrUE_config.prach_config.num_prach_fd_occasions_list);
+ free(UE);
+ free(PHY_vars_UE_g[0]);
+ free(PHY_vars_UE_g);
+
for (i=0; i<2; i++) {
free(s_re[i]);
free(s_im[i]);
@@ -933,5 +959,8 @@ int main(int argc, char **argv){
if (input_fd) fclose(input_fd);
+ loader_reset();
+ logTerm();
+
return(0);
}
diff --git a/openair1/SIMULATION/NR_PHY/pucchsim.c b/openair1/SIMULATION/NR_PHY/pucchsim.c
index d07469a4b79e87cc63f6c38c05ceaab3fdc953af..151d51d7267c77a944f7f3bc1c00a9051130fa51 100644
--- a/openair1/SIMULATION/NR_PHY/pucchsim.c
+++ b/openair1/SIMULATION/NR_PHY/pucchsim.c
@@ -26,6 +26,7 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
#include "common/config/config_userapi.h"
+#include "common/utils/load_module_shlib.h"
#include "common/utils/LOG/log.h"
#include "common/ran_context.h"
#include "PHY/types.h"
@@ -70,7 +71,6 @@ int main(int argc, char **argv)
double sigma2, sigma2_dB=10,SNR,snr0=-2.0,snr1=2.0;
double cfo=0;
uint8_t snr1set=0;
- int **txdataF,**rxdataF;
double **s_re,**s_im,**r_re,**r_im;
//int sync_pos, sync_pos_slot;
//FILE *rx_frame_file;
@@ -372,7 +372,7 @@ int main(int argc, char **argv)
printf("Transmitted payload is %ld, do_DTX = %d\n",actual_payload,do_DTX);
- RC.gNB = (PHY_VARS_gNB**) malloc(sizeof(PHY_VARS_gNB *));
+ RC.gNB = calloc(1, sizeof(PHY_VARS_gNB *));
RC.gNB[0] = calloc(1,sizeof(PHY_VARS_gNB));
gNB = RC.gNB[0];
gNB->pucch0_thres = pucch_DTX_thres;
@@ -441,24 +441,15 @@ int main(int argc, char **argv)
s_im = malloc(n_tx*sizeof(double*));
r_re = malloc(n_rx*sizeof(double*));
r_im = malloc(n_rx*sizeof(double*));
- txdataF = malloc(n_tx*sizeof(int*));
- rxdataF = malloc(n_rx*sizeof(int*));
- gNB->common_vars.rxdataF=rxdataF;
memcpy((void*)&gNB->frame_parms,(void*)frame_parms,sizeof(frame_parms));
for (int aatx=0; aatx<n_tx; aatx++) {
s_re[aatx] = calloc(1,frame_length_complex_samples*sizeof(double));
s_im[aatx] = calloc(1,frame_length_complex_samples*sizeof(double));
- printf("Allocating %d samples for txdataF\n",frame_parms->symbols_per_slot*frame_parms->ofdm_symbol_size);
- txdataF[aatx] = memalign(32,14*frame_parms->ofdm_symbol_size*sizeof(int));
- bzero(txdataF[aatx],14*frame_parms->ofdm_symbol_size*sizeof(int));
}
for (int aarx=0; aarx<n_rx; aarx++) {
r_re[aarx] = calloc(1,frame_length_complex_samples*sizeof(double));
r_im[aarx] = calloc(1,frame_length_complex_samples*sizeof(double));
- printf("Allocating %d samples for rxdataF\n",frame_parms->symbols_per_slot*frame_parms->ofdm_symbol_size);
- rxdataF[aarx] = memalign(32,14*frame_parms->ofdm_symbol_size*sizeof(int));
- bzero(rxdataF[aarx],14*frame_parms->ofdm_symbol_size*sizeof(int));
}
uint8_t mcs=0;
@@ -474,7 +465,6 @@ int main(int argc, char **argv)
mcs=table2_mcs[actual_payload+shift];
else AssertFatal(1==0,"Either nr_bit %d or sr_flag %d must be non-zero\n", nr_bit, sr_flag);
}
- else if (format == 2 && nr_bit > 11) gNB->uci_polarParams = nr_polar_params(2, nr_bit, nrofPRB, 1, NULL);
startingPRB_intraSlotHopping = N_RB_DL-1;
uint32_t hopping_id = Nid_cell;
@@ -490,7 +480,7 @@ int main(int argc, char **argv)
if(eps!=0.0)
UE->UE_fo_compensation = 1; // if a frequency offset is set then perform fo estimation and compensation
- if (init_nr_ue_signal(UE, 1, 0) != 0)
+ if (init_nr_ue_signal(UE, 1) != 0)
{
printf("Error at UE NR initialisation\n");
exit(-1);
@@ -536,6 +526,7 @@ int main(int argc, char **argv)
ack_nack_errors=0;
sr_errors=0;
n_errors = 0;
+ int **txdataF = gNB->common_vars.txdataF;
for (trial=0; trial<n_trials; trial++) {
for (int aatx=0;aatx<1;aatx++)
bzero(txdataF[aatx],frame_parms->ofdm_symbol_size*sizeof(int));
@@ -560,18 +551,17 @@ int main(int argc, char **argv)
if (n_trials==1) printf("txlev %d (%f dB), offset %d, sigma2 %f ( %f dB)\n",txlev,10*log10(txlev),startingSymbolIndex*frame_parms->ofdm_symbol_size,sigma2,sigma2_dB);
- int i0;
- double txr,txi,rxr,rxi,nr,ni;
+ struct complex16 **rxdataF = (struct complex16 **)gNB->common_vars.rxdataF;
for (int symb=0; symb<gNB->frame_parms.symbols_per_slot;symb++) {
if (symb<startingSymbolIndex || symb >= startingSymbolIndex+nrofSymbols) {
- i0 = symb*gNB->frame_parms.ofdm_symbol_size;
+ int i0 = symb*gNB->frame_parms.ofdm_symbol_size;
for (int re=0;re<N_RB_DL*12;re++) {
i=i0+((gNB->frame_parms.first_carrier_offset + re)%gNB->frame_parms.ofdm_symbol_size);
for (int aarx=0;aarx<n_rx;aarx++) {
- nr = sqrt(sigma2/2)*gaussdouble(0.0,1.0);
- ni = sqrt(sigma2/2)*gaussdouble(0.0,1.0);
- ((int16_t*)rxdataF[aarx])[i<<1] = (int16_t)(100.0*(nr)/sqrt((double)txlev));
- ((int16_t*)rxdataF[aarx])[1+(i<<1)] = (int16_t)(100.0*(ni)/sqrt((double)txlev));
+ double nr = sqrt(sigma2/2)*gaussdouble(0.0,1.0);
+ double ni = sqrt(sigma2/2)*gaussdouble(0.0,1.0);
+ rxdataF[aarx][i].r = (int16_t)(100.0*(nr)/sqrt((double)txlev));
+ rxdataF[aarx][i].i = (int16_t)(100.0*(ni)/sqrt((double)txlev));
}
}
}
@@ -579,43 +569,45 @@ int main(int argc, char **argv)
random_channel(UE2gNB,0);
freq_channel(UE2gNB,N_RB_DL,2*N_RB_DL+1,scs/1000);
- struct complexd phasor;
- double rxr_tmp;
for (int symb=0; symb<nrofSymbols; symb++) {
- i0 = (startingSymbolIndex + symb)*gNB->frame_parms.ofdm_symbol_size;
+ int i0 = (startingSymbolIndex + symb)*gNB->frame_parms.ofdm_symbol_size;
for (int re=0;re<N_RB_DL*12;re++) {
i=i0+((gNB->frame_parms.first_carrier_offset + re)%gNB->frame_parms.ofdm_symbol_size);
- phasor.r = cos(2*M_PI*phase*re);
+ struct complexd phasor;
+ phasor.r = cos(2*M_PI*phase*re);
phasor.i = sin(2*M_PI*phase*re);
for (int aarx=0;aarx<n_rx;aarx++) {
- txr = (double)(((int16_t *)txdataF[0])[(i<<1)]);
- txi = (double)(((int16_t *)txdataF[0])[1+(i<<1)]);
- rxr = txr*UE2gNB->chF[aarx][re].r - txi*UE2gNB->chF[aarx][re].i;
- rxi = txr*UE2gNB->chF[aarx][re].i + txi*UE2gNB->chF[aarx][re].r;
- rxr_tmp = rxr*phasor.r - rxi*phasor.i;
+ double txr = (double)(((int16_t *)txdataF[0])[(i<<1)]);
+ double txi = (double)(((int16_t *)txdataF[0])[1+(i<<1)]);
+ double rxr={0},rxi={0};
+ for (int l = 0; l<UE2gNB->channel_length; l++) {
+ rxr = txr*UE2gNB->chF[aarx][l].r - txi*UE2gNB->chF[aarx][l].i;
+ rxi = txr*UE2gNB->chF[aarx][l].i + txi*UE2gNB->chF[aarx][l].r;
+ }
+ double rxr_tmp = rxr*phasor.r - rxi*phasor.i;
rxi = rxr*phasor.i + rxi*phasor.r;
rxr = rxr_tmp;
- nr = sqrt(sigma2/2)*gaussdouble(0.0,1.0);
- ni = sqrt(sigma2/2)*gaussdouble(0.0,1.0);
- ((int16_t*)rxdataF[aarx])[i<<1] = (int16_t)(100.0*(rxr + nr)/sqrt((double)txlev));
- ((int16_t*)rxdataF[aarx])[1+(i<<1)]=(int16_t)(100.0*(rxi + ni)/sqrt((double)txlev));
+ double nr = sqrt(sigma2/2)*gaussdouble(0.0,1.0);
+ double ni = sqrt(sigma2/2)*gaussdouble(0.0,1.0);
+ rxdataF[aarx][i].r = (int16_t)(100.0*(rxr + nr)/sqrt((double)txlev));
+ rxdataF[aarx][i].i=(int16_t)(100.0*(rxi + ni)/sqrt((double)txlev));
if (n_trials==1 && abs(txr) > 0) printf("symb %d, re %d , aarx %d : txr %f, txi %f, chr %f, chi %f, nr %f, ni %f, rxr %f, rxi %f => %d,%d\n",
symb, re, aarx, txr,txi,
UE2gNB->chF[aarx][re].r,UE2gNB->chF[aarx][re].i,
nr,ni, rxr,rxi,
- ((int16_t*)rxdataF[aarx])[i<<1],((int16_t*)rxdataF[aarx])[1+(i<<1)]);
+ rxdataF[aarx][i].r,rxdataF[aarx][i].i);
}
}
}
int rxlev=0;
- for (int aarx=0;aarx<n_rx;aarx++) rxlev += signal_energy(&rxdataF[aarx][startingSymbolIndex*frame_parms->ofdm_symbol_size],
+ for (int aarx=0;aarx<n_rx;aarx++) rxlev += signal_energy((int32_t*)&rxdataF[aarx][startingSymbolIndex*frame_parms->ofdm_symbol_size],
frame_parms->ofdm_symbol_size);
int rxlev_pucch=0;
- for (int aarx=0;aarx<n_rx;aarx++) rxlev_pucch += signal_energy(&rxdataF[aarx][startingSymbolIndex*frame_parms->ofdm_symbol_size],
+ for (int aarx=0;aarx<n_rx;aarx++) rxlev_pucch += signal_energy((int32_t*)&rxdataF[aarx][startingSymbolIndex*frame_parms->ofdm_symbol_size],
12);
// set UL mask for pucch allocation
@@ -660,25 +652,26 @@ int main(int argc, char **argv)
if(sr_flag==1){
if (uci_pdu.sr->sr_indication == 0 || uci_pdu.sr->sr_confidence_level == 1)
sr_errors+=1;
+ free(uci_pdu.sr);
}
// harq value 0 -> pass
+ nfapi_nr_harq_t *harq_list = uci_pdu.harq->harq_list;
// confidence value 0 -> good confidence
- const int harq_value0 = uci_pdu.harq->harq_list[0].harq_value;
- const int harq_value1 = uci_pdu.harq->harq_list[1].harq_value;
const int confidence_lvl = uci_pdu.harq->harq_confidence_level;
if(nr_bit>0){
if (nr_bit==1 && do_DTX == 0)
- ack_nack_errors+=(actual_payload^(!harq_value0));
+ ack_nack_errors+=(actual_payload^(!harq_list[0].harq_value));
else if (do_DTX == 0)
- ack_nack_errors+=(((actual_payload&1)^(!harq_value0))+((actual_payload>>1)^(!harq_value1)));
- else if ((!confidence_lvl && !harq_value0) ||
- (!confidence_lvl && nr_bit == 2 && !harq_value1))
+ ack_nack_errors+=(((actual_payload&1)^(!harq_list[0].harq_value))+((actual_payload>>1)^(!harq_list[1].harq_value)));
+ else if ((!confidence_lvl && !harq_list[0].harq_value) ||
+ (!confidence_lvl && nr_bit == 2 && !harq_list[1].harq_value))
ack_nack_errors++;
free(uci_pdu.harq->harq_list);
}
+ free(uci_pdu.harq);
}
else if (format==1) {
- nr_decode_pucch1(rxdataF,PUCCH_GroupHopping,hopping_id,
+ nr_decode_pucch1((int32_t **)rxdataF,PUCCH_GroupHopping,hopping_id,
&(payload_received),frame_parms,amp,nr_slot_tx,
m0,nrofSymbols,startingSymbolIndex,startingPRB,
startingPRB_intraSlotHopping,timeDomainOCC,nr_bit);
@@ -688,8 +681,8 @@ int main(int argc, char **argv)
ack_nack_errors+=((actual_payload^payload_received)&1) + (((actual_payload^payload_received)&2)>>1);
}
else if (format==2) {
- nfapi_nr_uci_pucch_pdu_format_2_3_4_t uci_pdu;
- nfapi_nr_pucch_pdu_t pucch_pdu;
+ nfapi_nr_uci_pucch_pdu_format_2_3_4_t uci_pdu={0};
+ nfapi_nr_pucch_pdu_t pucch_pdu={0};
pucch_pdu.rnti = 0x1234;
pucch_pdu.subcarrier_spacing = 1;
pucch_pdu.group_hop_flag = PUCCH_GroupHopping&1;
@@ -734,26 +727,34 @@ int main(int argc, char **argv)
break;
}
}
+ free_channel_desc_scm(UE2gNB);
+ term_freq_channel();
+
+ phy_free_nr_gNB(gNB);
+ free(RC.gNB[0]);
+ free(RC.gNB);
+
+ term_nr_ue_signal(UE, 1);
+ free(UE);
for (int aatx=0; aatx<n_tx; aatx++) {
free(s_re[aatx]);
free(s_im[aatx]);
- free(txdataF[aatx]);
}
for (int aarx=0; aarx<n_rx; aarx++) {
free(r_re[aarx]);
free(r_im[aarx]);
- free(rxdataF[aarx]);
}
free(s_re);
free(s_im);
free(r_re);
free(r_im);
- free(txdataF);
- free(rxdataF);
if (output_fd) fclose(output_fd);
if (input_fd) fclose(input_fd);
+ loader_reset();
+ logTerm();
+
return(n_errors);
}
diff --git a/openair1/SIMULATION/NR_PHY/ulschsim.c b/openair1/SIMULATION/NR_PHY/ulschsim.c
index 931a63a77e3aae6d3f74a04de84c4ce03c2bb31a..6cdf0b90cd65b030b4519c75386669464495922c 100644
--- a/openair1/SIMULATION/NR_PHY/ulschsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulschsim.c
@@ -26,6 +26,7 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
#include "common/config/config_userapi.h"
+#include "common/utils/load_module_shlib.h"
#include "common/utils/LOG/log.h"
#include "common/ran_context.h"
#include "PHY/types.h"
@@ -372,7 +373,7 @@ int main(int argc, char **argv)
RC.gNB = (PHY_VARS_gNB **) malloc(sizeof(PHY_VARS_gNB *));
- RC.gNB[0] = malloc(sizeof(PHY_VARS_gNB));
+ RC.gNB[0] = calloc(1, sizeof(PHY_VARS_gNB));
gNB = RC.gNB[0];
//gNB_config = &gNB->gNB_config;
@@ -400,7 +401,7 @@ int main(int argc, char **argv)
memcpy(&UE->frame_parms, frame_parms, sizeof(NR_DL_FRAME_PARMS));
//phy_init_nr_top(frame_parms);
- if (init_nr_ue_signal(UE, 1, 0) != 0) {
+ if (init_nr_ue_signal(UE, 1) != 0) {
printf("Error at UE NR initialisation.\n");
exit(-1);
}
@@ -408,7 +409,7 @@ int main(int argc, char **argv)
for (sf = 0; sf < 2; sf++) {
for (i = 0; i < 2; i++) {
- UE->ulsch[sf][0][i] = new_nr_ue_ulsch(N_RB_UL, 8, 0);
+ UE->ulsch[sf][0][i] = new_nr_ue_ulsch(N_RB_UL, 8);
if (!UE->ulsch[sf][0][i]) {
printf("Can't get ue ulsch structures.\n");
@@ -454,46 +455,39 @@ int main(int argc, char **argv)
rel15_ul->pusch_data.tb_size = TBS/8;
///////////////////////////////////////////////////
- double *modulated_input = malloc16(sizeof(double) * 16 * 68 * 384); // [hna] 16 segments, 68*Zc
- short *channel_output_fixed = malloc16(sizeof(short) * 16 * 68 * 384);
- short *channel_output_uncoded = malloc16(sizeof(unsigned short) * 16 * 68 * 384);
+ double modulated_input[16 * 68 * 384]; // [hna] 16 segments, 68*Zc
+ short channel_output_fixed[16 * 68 * 384];
+ short channel_output_uncoded[16 * 68 * 384];
unsigned int errors_bit_uncoded = 0;
- unsigned char *estimated_output_bit;
- unsigned char *test_input_bit;
unsigned int errors_bit = 0;
- test_input_bit = (unsigned char *) malloc16(sizeof(unsigned char) * 16 * 68 * 384);
- estimated_output_bit = (unsigned char *) malloc16(sizeof(unsigned char) * 16 * 68 * 384);
-
- unsigned char *test_input;
- test_input = (unsigned char *) malloc16(sizeof(unsigned char) * TBS / 8);
-
- for (i = 0; i < TBS / 8; i++)
- test_input[i] = (unsigned char) rand();
+ unsigned char test_input_bit[16 * 68 * 384];
+ unsigned char estimated_output_bit[16 * 68 * 384];
/////////////////////////[adk] preparing UL harq_process parameters/////////////////////////
///////////
NR_UL_UE_HARQ_t *harq_process_ul_ue = ulsch_ue->harq_processes[harq_pid];
+ DevAssert(harq_process_ul_ue);
N_PRB_oh = 0; // higher layer (RRC) parameter xOverhead in PUSCH-ServingCellConfig
N_RE_prime = NR_NB_SC_PER_RB*nb_symb_sch - nb_re_dmrs - N_PRB_oh;
- if (harq_process_ul_ue) {
-
- harq_process_ul_ue->pusch_pdu.rnti = n_rnti;
- harq_process_ul_ue->pusch_pdu.mcs_index = Imcs;
- harq_process_ul_ue->pusch_pdu.nrOfLayers = Nl;
- harq_process_ul_ue->pusch_pdu.rb_size = nb_rb;
- harq_process_ul_ue->pusch_pdu.nr_of_symbols = nb_symb_sch;
- harq_process_ul_ue->num_of_mod_symbols = N_RE_prime*nb_rb*nb_codewords;
- harq_process_ul_ue->pusch_pdu.pusch_data.rv_index = rvidx;
- harq_process_ul_ue->pusch_pdu.pusch_data.tb_size = TBS/8;
- harq_process_ul_ue->a = &test_input[0];
+ harq_process_ul_ue->pusch_pdu.rnti = n_rnti;
+ harq_process_ul_ue->pusch_pdu.mcs_index = Imcs;
+ harq_process_ul_ue->pusch_pdu.nrOfLayers = Nl;
+ harq_process_ul_ue->pusch_pdu.rb_size = nb_rb;
+ harq_process_ul_ue->pusch_pdu.nr_of_symbols = nb_symb_sch;
+ harq_process_ul_ue->num_of_mod_symbols = N_RE_prime*nb_rb*nb_codewords;
+ harq_process_ul_ue->pusch_pdu.pusch_data.rv_index = rvidx;
+ harq_process_ul_ue->pusch_pdu.pusch_data.tb_size = TBS/8;
+ unsigned char *test_input = harq_process_ul_ue->a;
- }
///////////
////////////////////////////////////////////////////////////////////////////////////////////
+ for (i = 0; i < TBS / 8; i++)
+ test_input[i] = (unsigned char) rand();
+
#ifdef DEBUG_NR_ULSCHSIM
for (i = 0; i < TBS / 8; i++) printf("test_input[i]=%hhu \n",test_input[i]);
#endif
@@ -620,6 +614,19 @@ int main(int argc, char **argv)
printf("\n");
}
+ for (sf = 0; sf < 2; sf++)
+ for (i = 0; i < 2; i++)
+ free_nr_ue_ulsch(&UE->ulsch[sf][0][i], N_RB_UL);
+ term_nr_ue_signal(UE, 1);
+ free(UE);
+
+ phy_free_nr_gNB(gNB);
+ free(gNB->threadPool);
+ free(gNB->respDecode);
+ free(RC.gNB[0]);
+ free(RC.gNB);
+
+ free_channel_desc_scm(gNB2UE);
if (output_fd)
fclose(output_fd);
@@ -627,6 +634,9 @@ int main(int argc, char **argv)
if (input_fd)
fclose(input_fd);
+ loader_reset();
+ logTerm();
+
return (n_errors);
}
diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c
index c71f52c41a65b148ebc8dbf49a6e8440b2b117b4..aebaf424838c5f4f37b73815584075925afc7105 100644
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -68,6 +68,12 @@
#include <openair3/ocp-gtpu/gtp_itf.h>
//#define DEBUG_ULSIM
+const char *__asan_default_options()
+{
+ /* don't do leak checking in nr_ulsim, not finished yet */
+ return "detect_leaks=0";
+}
+
LCHAN_DESC DCCH_LCHAN_DESC,DTCH_DL_LCHAN_DESC,DTCH_UL_LCHAN_DESC;
rlc_info_t Rlc_info_um,Rlc_info_am_config;
@@ -139,7 +145,12 @@ gtpv1u_create_s1u_tunnel(
return 0;
}
-int ocp_gtpv1u_delete_s1u_tunnel(const instance_t instance, const gtpv1u_enb_delete_tunnel_req_t *const req_pP) {
+int gtpv1u_delete_s1u_tunnel(const instance_t instance, const gtpv1u_enb_delete_tunnel_req_t *const req_pP) {
+ return 0;
+}
+
+int gtpv1u_delete_ngu_tunnel( const instance_t instance,
+ gtpv1u_gnb_delete_tunnel_req_t *req) {
return 0;
}
@@ -720,7 +731,7 @@ int main(int argc, char **argv)
prepare_scd(scd);
- fill_default_secondaryCellGroup(scc, scd, secondaryCellGroup, 0, 1, n_tx, 0, 0, 0, 0, 0);
+ fill_default_secondaryCellGroup(scc, scd, secondaryCellGroup, 0, 1, n_tx, 0, 0, 0, 0);
// xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, (const void*)secondaryCellGroup);
@@ -731,9 +742,9 @@ int main(int argc, char **argv)
gNB->if_inst->NR_PHY_config_req = nr_phy_config_request;
// common configuration
- rrc_mac_config_req_gNB(0,0, n_tx, n_rx, 0, scc, &rrc.carrier.mib,0, 0, NULL);
+ rrc_mac_config_req_gNB(0,0, n_tx, n_rx, 0, 6, scc, &rrc.carrier.mib,0, 0, NULL);
// UE dedicated configuration
- rrc_mac_config_req_gNB(0,0, n_tx, n_rx, 0, scc, &rrc.carrier.mib,1, secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity,secondaryCellGroup);
+ rrc_mac_config_req_gNB(0,0, n_tx, n_rx, 0, 6, scc, &rrc.carrier.mib,1, secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity,secondaryCellGroup);
frame_parms->nb_antennas_tx = n_tx;
frame_parms->nb_antennas_rx = n_rx;
nfapi_nr_config_request_scf_t *cfg = &gNB->gNB_config;
@@ -755,28 +766,17 @@ int main(int argc, char **argv)
PHY_vars_UE_g[0][0] = UE;
memcpy(&UE->frame_parms, frame_parms, sizeof(NR_DL_FRAME_PARMS));
- //phy_init_nr_top(frame_parms);
- if (init_nr_ue_signal(UE, 1, 0) != 0) {
+ if (init_nr_ue_signal(UE, 1) != 0) {
printf("Error at UE NR initialisation\n");
exit(-1);
}
- //nr_init_frame_parms_ue(&UE->frame_parms);
- init_nr_ue_transport(UE, 0);
+ init_nr_ue_transport(UE);
- /*
- for (int sf = 0; sf < 2; sf++) {
- for (i = 0; i < 2; i++) {
-
- UE->ulsch[sf][0][i] = new_nr_ue_ulsch(N_RB_UL, 8, 0);
-
- if (!UE->ulsch[sf][0][i]) {
- printf("Can't get ue ulsch structures\n");
- exit(-1);
- }
- }
- }
- */
+ // initialize the pusch dmrs
+ uint16_t N_n_scid[2] = {frame_parms->Nid_cell,frame_parms->Nid_cell};
+ int n_scid = 0; // This quantity is indicated by higher layer parameter dmrs-SeqInitialization
+ nr_init_pusch_dmrs(UE, N_n_scid, n_scid);
//Configure UE
NR_UE_RRC_INST_t rrcue;
diff --git a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c
index f3dbc78a737d19f4860a5f8805c28fe9637f3cd1..4334bd12f9d9f7adbfaa8a3fa0fa8c6f829848f6 100644
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c
@@ -71,7 +71,7 @@ static nfapi_config_request_t *config =&config_t;
/*************** FUNCTIONS ****************************************/
//void phy_init_nr_top(NR_DL_FRAME_PARMS *frame_parms);
-int init_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_eNB, uint8_t abstraction_flag);
+int init_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_eNB);
/*******************************************************************
*
@@ -248,7 +248,7 @@ int init_test(unsigned char N_tx, unsigned char N_rx, unsigned char transmission
//phy_init_nr_top(frame_parms);
- if (init_nr_ue_signal(PHY_vars_UE, 1, 0) != 0) {
+ if (init_nr_ue_signal(PHY_vars_UE, 1) != 0) {
LOG_E(PHY,"Error at UE NR initialisation : at line %d in function %s of file %s \n", LINE_FILE , __func__, FILE_NAME);
return (0);
}
diff --git a/openair1/SIMULATION/TOOLS/abstraction.c b/openair1/SIMULATION/TOOLS/abstraction.c
index a6b058688275e2a7642df3c66371f5c4cc4d84ca..b1cd691ec4dfb7093375f8fb314749e17dda4076 100644
--- a/openair1/SIMULATION/TOOLS/abstraction.c
+++ b/openair1/SIMULATION/TOOLS/abstraction.c
@@ -33,11 +33,26 @@
// NEW code with lookup table for sin/cos based on delay profile (TO BE TESTED)
double **cos_lut=NULL,* *sin_lut=NULL;
+static int freq_channel_init = 0;
+static int n_samples_max = 0;
//#if 1
-
+void term_freq_channel(void)
+{
+ for (int f = -(n_samples_max >> 1); f <= n_samples_max >> 1; f++) {
+ const int idx = f + (n_samples_max >> 1);
+ if (cos_lut[idx])
+ free_and_zero(cos_lut[idx]);
+ if (sin_lut[idx])
+ free_and_zero(sin_lut[idx]);
+ }
+ free_and_zero(cos_lut);
+ free_and_zero(sin_lut);
+ freq_channel_init = 0;
+ n_samples_max = 0;
+}
int init_freq_channel(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int scs) {
double delta_f,freq; // 90 kHz spacing
@@ -78,8 +93,6 @@ int freq_channel(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int scs)
int16_t f,f2,d;
uint8_t aarx,aatx,l;
double *clut,*slut;
- static int freq_channel_init=0;
- static int n_samples_max=0;
// do some error checking
// n_samples has to be a odd number because we assume the spectrum is symmetric around the DC and includes the DC
diff --git a/openair1/SIMULATION/TOOLS/random_channel.c b/openair1/SIMULATION/TOOLS/random_channel.c
index f09d1a7ce18727016cc8bb5d812e283b13c0f130..0f6b8fb1bc15af0c1cb7cff7c0774e9884032bdd 100644
--- a/openair1/SIMULATION/TOOLS/random_channel.c
+++ b/openair1/SIMULATION/TOOLS/random_channel.c
@@ -125,7 +125,7 @@ void fill_channel_desc(channel_desc_t *chan_desc,
chan_desc->ch[i] = (struct complexd *) malloc(channel_length * sizeof(struct complexd));
for (i = 0; i<nb_tx*nb_rx; i++)
- chan_desc->chF[i] = (struct complexd *) malloc(1200 * sizeof(struct complexd)); // allocate for up to 100 RBs, 12 samples per RB
+ chan_desc->chF[i] = (struct complexd *) malloc(275 * 12 * sizeof(struct complexd)); // allocate for up to 275 RBs, 12 symbols per RB
LOG_D(OCM,"[CHANNEL] Filling a (nb_taps %d)\n",nb_taps);
diff --git a/openair1/SIMULATION/TOOLS/sim.h b/openair1/SIMULATION/TOOLS/sim.h
index ce470fe0b00f25dfcc33f15735e480976ac327a9..f12483d70a1ac2d6440dbd6c35f278acce76d21e 100644
--- a/openair1/SIMULATION/TOOLS/sim.h
+++ b/openair1/SIMULATION/TOOLS/sim.h
@@ -479,6 +479,7 @@ void randominit(unsigned int seed_init);
double uniformrandom(void);
int freq_channel(channel_desc_t *desc,uint16_t nb_rb, int16_t n_samples,int scs);
int init_freq_channel(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int scs);
+void term_freq_channel(void);
uint8_t multipath_channel_nosigconv(channel_desc_t *desc);
void multipath_tv_channel(channel_desc_t *desc,
double **tx_sig_re,
diff --git a/openair2/COMMON/gtpv1_u_messages_def.h b/openair2/COMMON/gtpv1_u_messages_def.h
index 2835d07e4ae9c523c17411e1842fe5792473fa3b..44e9d4fbdf2b2243e48c87b7c52dabaf2a13f72d 100644
--- a/openair2/COMMON/gtpv1_u_messages_def.h
+++ b/openair2/COMMON/gtpv1_u_messages_def.h
@@ -19,18 +19,12 @@
* contact@openairinterface.org
*/
-MESSAGE_DEF(GTPV1U_ENB_UPDATE_TUNNEL_REQ, MESSAGE_PRIORITY_MED, gtpv1u_enb_update_tunnel_req_t, Gtpv1uUpdateTunnelReq)
-MESSAGE_DEF(GTPV1U_ENB_UPDATE_TUNNEL_RESP, MESSAGE_PRIORITY_MED, gtpv1u_enb_update_tunnel_resp_t, Gtpv1uUpdateTunnelResp)
-MESSAGE_DEF(GTPV1U_ENB_DELETE_TUNNEL_REQ, MESSAGE_PRIORITY_MED, gtpv1u_enb_delete_tunnel_req_t, Gtpv1uDeleteTunnelReq)
-MESSAGE_DEF(GTPV1U_ENB_DELETE_TUNNEL_RESP, MESSAGE_PRIORITY_MED, gtpv1u_enb_delete_tunnel_resp_t, Gtpv1uDeleteTunnelResp)
-MESSAGE_DEF(GTPV1U_ENB_TUNNEL_DATA_IND, MESSAGE_PRIORITY_MED, gtpv1u_enb_tunnel_data_ind_t, Gtpv1uTunnelDataInd)
+
MESSAGE_DEF(GTPV1U_ENB_TUNNEL_DATA_REQ, MESSAGE_PRIORITY_MED, gtpv1u_enb_tunnel_data_req_t, Gtpv1uTunnelDataReq)
MESSAGE_DEF(GTPV1U_ENB_DATA_FORWARDING_REQ, MESSAGE_PRIORITY_MED, gtpv1u_enb_data_forwarding_req_t,Gtpv1uDataForwardingReq)
MESSAGE_DEF(GTPV1U_ENB_DATA_FORWARDING_IND, MESSAGE_PRIORITY_MED, gtpv1u_enb_data_forwarding_ind_t,Gtpv1uDataForwardingInd)
MESSAGE_DEF(GTPV1U_ENB_END_MARKER_REQ, MESSAGE_PRIORITY_MED, gtpv1u_enb_end_marker_req_t, Gtpv1uEndMarkerReq)
MESSAGE_DEF(GTPV1U_ENB_END_MARKER_IND, MESSAGE_PRIORITY_MED, gtpv1u_enb_end_marker_ind_t, Gtpv1uEndMarkerInd)
-MESSAGE_DEF(GTPV1U_REQ, MESSAGE_PRIORITY_MED, Gtpv1uReq, gtpv1uReq)
+MESSAGE_DEF(GTPV1U_REQ, MESSAGE_PRIORITY_MED, Gtpv1uReq, gtpv1uReq)
-MESSAGE_DEF(GTPV1U_GNB_DELETE_TUNNEL_REQ, MESSAGE_PRIORITY_MED, gtpv1u_gnb_delete_tunnel_req_t, NRGtpv1uDeleteTunnelReq)
-MESSAGE_DEF(GTPV1U_GNB_DELETE_TUNNEL_RESP, MESSAGE_PRIORITY_MED, gtpv1u_gnb_delete_tunnel_resp_t, NRGtpv1uDeleteTunnelResp)
MESSAGE_DEF(GTPV1U_GNB_TUNNEL_DATA_REQ, MESSAGE_PRIORITY_MED, gtpv1u_gnb_tunnel_data_req_t, NRGtpv1uTunnelDataReq)
diff --git a/openair2/COMMON/gtpv1_u_messages_types.h b/openair2/COMMON/gtpv1_u_messages_types.h
index 2dd476ab686c06a950294334c6e5bf90150154ed..096f0f4697276ac094d21f861785ffa0e07b5620 100644
--- a/openair2/COMMON/gtpv1_u_messages_types.h
+++ b/openair2/COMMON/gtpv1_u_messages_types.h
@@ -28,10 +28,6 @@
#define GTPV1U_MAX_BEARERS_PER_UE max_val_LTE_DRB_Identity
#define NR_GTPV1U_MAX_BEARERS_PER_UE max_val_NR_DRB_Identity
-#define GTPV1U_ENB_UPDATE_TUNNEL_REQ(mSGpTR) (mSGpTR)->ittiMsg.Gtpv1uUpdateTunnelReq
-#define GTPV1U_ENB_UPDATE_TUNNEL_RESP(mSGpTR) (mSGpTR)->ittiMsg.Gtpv1uUpdateTunnelResp
-#define GTPV1U_ENB_DELETE_TUNNEL_REQ(mSGpTR) (mSGpTR)->ittiMsg.Gtpv1uDeleteTunnelReq
-#define GTPV1U_ENB_DELETE_TUNNEL_RESP(mSGpTR) (mSGpTR)->ittiMsg.Gtpv1uDeleteTunnelResp
#define GTPV1U_ENB_TUNNEL_DATA_IND(mSGpTR) (mSGpTR)->ittiMsg.Gtpv1uTunnelDataInd
#define GTPV1U_ENB_TUNNEL_DATA_REQ(mSGpTR) (mSGpTR)->ittiMsg.Gtpv1uTunnelDataReq
#define GTPV1U_ENB_DATA_FORWARDING_REQ(mSGpTR) (mSGpTR)->ittiMsg.Gtpv1uDataForwardingReq
@@ -41,8 +37,6 @@
#define GTPV1U_REQ(mSGpTR) (mSGpTR)->ittiMsg.gtpv1uReq
-#define GTPV1U_GNB_DELETE_TUNNEL_REQ(mSGpTR) (mSGpTR)->ittiMsg.NRGtpv1uDeleteTunnelReq
-#define GTPV1U_GNB_DELETE_TUNNEL_RESP(mSGpTR) (mSGpTR)->ittiMsg.NRGtpv1uDeleteTunnelResp
#define GTPV1U_GNB_TUNNEL_DATA_REQ(mSGpTR) (mSGpTR)->ittiMsg.NRGtpv1uTunnelDataReq
#define GTPV1U_ALL_TUNNELS_TEID (teid_t)0xFFFFFFFF
@@ -200,7 +194,6 @@ typedef struct gtpv1u_gnb_create_tunnel_resp_s {
pdusessionid_t pdusession_id[NR_GTPV1U_MAX_BEARERS_PER_UE];
transport_layer_addr_t gnb_addr;
} gtpv1u_gnb_create_tunnel_resp_t;
-
typedef struct gtpv1u_gnb_delete_tunnel_req_s {
rnti_t rnti;
uint8_t num_pdusession;
@@ -212,7 +205,6 @@ typedef struct gtpv1u_gnb_delete_tunnel_resp_s {
uint8_t status; ///< Status of NGU endpoint deleteion (Failed = 0xFF or Success = 0x0)
teid_t gnb_NGu_teid; ///< local NGU Tunnel Endpoint Identifier to be deleted
} gtpv1u_gnb_delete_tunnel_resp_t;
-
typedef struct gtpv1u_gnb_tunnel_data_req_s {
uint8_t *buffer;
uint32_t length;
diff --git a/openair2/COMMON/ngap_messages_types.h b/openair2/COMMON/ngap_messages_types.h
index 60d48c8284112420a1d907b70d0b783828c8a408..ca7dd0b0bb2c08ef0227c9a53db8a59863fc6650 100644
--- a/openair2/COMMON/ngap_messages_types.h
+++ b/openair2/COMMON/ngap_messages_types.h
@@ -353,9 +353,18 @@ typedef struct pdusession_tobeswitched_s {
uint32_t gtp_teid;
} pdusession_tobeswitched_t;
+typedef struct qos_flow_tobe_modified_s {
+ uint8_t qfi; // 0~63
+} qos_flow_tobe_modified_t;
+
typedef struct pdusession_modify_s {
/* Unique pdusession_id for the UE. */
uint8_t pdusession_id;
+
+ uint8_t nb_of_qos_flow;
+
+ // qos_flow_add_or_modify
+ qos_flow_tobe_modified_t qos[QOSFLOW_MAX_VALUE];
} pdusession_modify_t;
typedef enum ngap_Cause_e {
@@ -821,7 +830,7 @@ typedef struct ngap_pdusession_modify_req_s {
/* Number of pdusession to be modify in the list */
uint8_t nb_pdusessions_tomodify;
- /* E RAB modify request */
+ /* pdu session modify request */
pdusession_t pdusession_modify_params[NGAP_MAX_PDUSESSION];
} ngap_pdusession_modify_req_t;
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index a08bcf4baf96e922a754a319362693329217ec03..f4550f63a15b3e067da94975db420b3c57d221af 100644
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -55,7 +55,6 @@
#include "common/config/config_userapi.h"
#include "RRC_config_tools.h"
#include "enb_paramdef.h"
-#include "proto_agent.h"
#include "executables/thread-common.h"
#include <openair3/ocp-gtpu/gtp_itf.h>
@@ -2080,7 +2079,7 @@ int RCconfig_gtpu(void ) {
GTPV1U_REQ(message).localPort = enb_port_for_S1U;
strcpy(GTPV1U_REQ(message).localAddrStr,address);
sprintf(GTPV1U_REQ(message).localPortStr,"%d", enb_port_for_S1U);
- itti_send_msg_to_task (TASK_VARIABLE, 0, message); // data model is wrong: gtpu doesn't have enb_id (or module_id)
+ itti_send_msg_to_task (TASK_GTPV1_U, 0, message); // data model is wrong: gtpu doesn't have enb_id (or module_id)
} else
LOG_E(GTPU,"invalid address for S1U\n");
diff --git a/openair2/F1AP/f1ap_common.h b/openair2/F1AP/f1ap_common.h
index a393930c8186c138086645a638b7d78ff79db17f..66451530a61194479ac98e5f23fb17e78c5cdb60 100644
--- a/openair2/F1AP/f1ap_common.h
+++ b/openair2/F1AP/f1ap_common.h
@@ -357,7 +357,6 @@
#include <arpa/inet.h>
#include "T.h"
#include "common/ran_context.h"
-#include "msc.h"
/* Checking version of ASN1C compiler */
#if (ASN1C_ENVIRONMENT_VERSION < ASN1C_MINIMUM_VERSION)
diff --git a/openair2/F1AP/f1ap_cu_task.c b/openair2/F1AP/f1ap_cu_task.c
index 13f08b9458846c5118190b3adac681fe51257846..b3c7363ca4ac0391e7f5b4f9b52eb96162ff863d 100644
--- a/openair2/F1AP/f1ap_cu_task.c
+++ b/openair2/F1AP/f1ap_cu_task.c
@@ -35,7 +35,6 @@
#include "f1ap_cu_rrc_message_transfer.h"
#include "f1ap_cu_ue_context_management.h"
#include "f1ap_cu_task.h"
-#include "proto_agent.h"
#include <openair3/ocp-gtpu/gtp_itf.h>
//Fixme: Uniq dirty DU instance, by global var, datamodel need better management
@@ -47,7 +46,7 @@ static instance_t cu_task_create_gtpu_instance_to_du(eth_params_t *IPaddrs) {
strncpy(tmp.destinationHost, IPaddrs->remote_addr, sizeof(tmp.destinationHost)-1);
sprintf(tmp.originService, "%d", IPaddrs->my_portd);
sprintf(tmp.destinationService, "%d", IPaddrs->remote_portd);
- return ocp_gtpv1Init(tmp);
+ return gtpv1Init(tmp);
}
static void cu_task_handle_sctp_association_ind(instance_t instance, sctp_new_association_ind_t *sctp_new_association_ind,
diff --git a/openair2/F1AP/f1ap_du_interface_management.c b/openair2/F1AP/f1ap_du_interface_management.c
index ce54e901919ea60b8e56a2016ae3fdff0dfa3c1b..6d4757be6f6ea0b365cb42b7f33bfbc76222fa3f 100644
--- a/openair2/F1AP/f1ap_du_interface_management.c
+++ b/openair2/F1AP/f1ap_du_interface_management.c
@@ -481,14 +481,6 @@ int DU_handle_F1_SETUP_RESPONSE(instance_t instance,
for (int i=0; i<num_cells_to_activate; i++)
AssertFatal(F1AP_SETUP_RESP (msg_p).cells_to_activate[i].num_SI > 0, "System Information %d is missing",i);
- MSC_LOG_RX_MESSAGE(
- MSC_F1AP_DU,
- MSC_F1AP_CU,
- 0,
- 0,
- MSC_AS_TIME_FMT" DU_handle_F1_SETUP_RESPONSE successfulOutcome assoc_id %d",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- assoc_id);
LOG_D(F1AP, "Sending F1AP_SETUP_RESP ITTI message\n");
itti_send_msg_to_task(TASK_F1APP, GNB_MODULE_ID_TO_INSTANCE(assoc_id), msg_p);
return 0;
@@ -910,14 +902,6 @@ int DU_handle_gNB_CU_CONFIGURATION_UPDATE(instance_t instance,
AssertFatal(TransactionId!=-1,"TransactionId was not sent\n");
LOG_D(F1AP,"F1AP: num_cells_to_activate %d\n",num_cells_to_activate);
F1AP_GNB_CU_CONFIGURATION_UPDATE (msg_p).num_cells_to_activate = num_cells_to_activate;
- MSC_LOG_RX_MESSAGE(
- MSC_F1AP_DU,
- MSC_F1AP_CU,
- 0,
- 0,
- MSC_AS_TIME_FMT" DU_handle_GNB_CU_CONFIGURATION_UPDATE initiatingMessage assoc_id %d",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- assoc_id);
LOG_D(F1AP, "Sending F1AP_GNB_CU_CONFIGURATION_UPDATE ITTI message \n");
itti_send_msg_to_task(TASK_F1APP, GNB_MODULE_ID_TO_INSTANCE(assoc_id), msg_p);
return 0;
diff --git a/openair2/F1AP/f1ap_du_task.c b/openair2/F1AP/f1ap_du_task.c
index 537f0060aecb072e6789c85ae7b6eb18ce8dacad..c8cfadb99901b6117486da7353961b0ca8eeb78b 100644
--- a/openair2/F1AP/f1ap_du_task.c
+++ b/openair2/F1AP/f1ap_du_task.c
@@ -35,7 +35,6 @@
#include "f1ap_du_ue_context_management.h"
#include "f1ap_du_rrc_message_transfer.h"
#include "f1ap_du_task.h"
-#include "proto_agent.h"
#include <openair3/ocp-gtpu/gtp_itf.h>
//Fixme: Uniq dirty DU instance, by global var, datamodel need better management
@@ -103,7 +102,7 @@ static instance_t du_create_gtpu_instance_to_cu(char *CUaddr, uint16_t CUport, c
strncpy(tmp.destinationHost, CUaddr, sizeof(tmp.destinationHost)-1);
sprintf(tmp.originService, "%d", DUport);
sprintf(tmp.destinationService, "%d", CUport);
- return ocp_gtpv1Init(tmp);
+ return gtpv1Init(tmp);
}
void *F1AP_DU_task(void *arg) {
diff --git a/openair2/GNB_APP/gnb_app.c b/openair2/GNB_APP/gnb_app.c
index 7d51d95840635fe98dcfc104f07392797b74c106..821e2def84afca4c56a60feffaef75f987423c9c 100644
--- a/openair2/GNB_APP/gnb_app.c
+++ b/openair2/GNB_APP/gnb_app.c
@@ -31,8 +31,8 @@
#include <stdio.h>
#include <nr_pdcp/nr_pdcp.h>
#include <softmodem-common.h>
+#include <nr-softmodem.h>
#include <split_headers.h>
-#include <proto_agent.h>
#include "gnb_app.h"
#include "gnb_config.h"
@@ -135,34 +135,6 @@ static uint32_t gNB_app_register_x2(uint32_t gnb_id_start, uint32_t gnb_id_end)
/*------------------------------------------------------------------------------*/
-static void init_pdcp(void) {
- if (!NODE_IS_DU(RC.nrrrc[0]->node_type)) {
- pdcp_layer_init();
- uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ?
- (PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT;
- if (IS_SOFTMODEM_NOS1) {
- LOG_I(PDCP, "IS_SOFTMODEM_NOS1 option enabled\n");
- pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT;
- }
-
- nr_pdcp_module_init(pdcp_initmask, 0);
-
- if (NODE_IS_CU(RC.nrrrc[0]->node_type)) {
- LOG_I(PDCP, "node is CU, pdcp send rlc_data_req by proto_agent \n");
- pdcp_set_rlc_data_req_func(proto_agent_send_rlc_data_req);
- } else {
- LOG_I(PDCP, "node is gNB \n");
- pdcp_set_rlc_data_req_func(rlc_data_req);
- pdcp_set_pdcp_data_ind_func(pdcp_data_ind);
- }
- } else {
- LOG_I(PDCP, "node is DU, rlc send pdcp_data_ind by proto_agent \n");
- pdcp_set_pdcp_data_ind_func(proto_agent_send_pdcp_data_ind);
- }
-}
-
-/*------------------------------------------------------------------------------*/
-
void *gNB_app_task(void *args_p)
{
diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c
index b088cf7ed16fe2425a0533794628aa600b0bcf71..05c4bb0ecbb0f4b5ed3b2f395198468b04e6d9dd 100644
--- a/openair2/GNB_APP/gnb_config.c
+++ b/openair2/GNB_APP/gnb_config.c
@@ -31,6 +31,7 @@
#include <inttypes.h>
#include "common/utils/LOG/log.h"
+#include "common/utils/nr/nr_common.h"
#include "common/utils/LOG/log_extern.h"
#include "assertions.h"
#include "gnb_config.h"
@@ -47,7 +48,6 @@
// #include "SystemInformationBlockType2.h"
// #include "LAYER2/MAC/extern.h"
// #include "LAYER2/MAC/proto.h"
-#include "PHY/phy_extern.h"
#include "PHY/INIT/phy_init.h"
#include "targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
#include "nfapi_vnf.h"
@@ -346,9 +346,16 @@ void fix_scc(NR_ServingCellConfigCommon_t *scc,uint64_t ssbmap) {
// prepare DL Allocation lists
nr_rrc_config_dl_tda(scc);
- if (scc->tdd_UL_DL_ConfigurationCommon->pattern2->dl_UL_TransmissionPeriodicity > 320 ) {
- free(scc->tdd_UL_DL_ConfigurationCommon->pattern2);
- scc->tdd_UL_DL_ConfigurationCommon->pattern2=NULL;
+ lte_frame_type_t frame_type = get_frame_type((int)*scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0], *scc->ssbSubcarrierSpacing);
+ if (frame_type == FDD) {
+ ASN_STRUCT_FREE(asn_DEF_NR_TDD_UL_DL_ConfigCommon, scc->tdd_UL_DL_ConfigurationCommon);
+ scc->tdd_UL_DL_ConfigurationCommon = NULL;
+ } else { // TDD
+ if (scc->tdd_UL_DL_ConfigurationCommon->pattern2->dl_UL_TransmissionPeriodicity > 320 ) {
+ free(scc->tdd_UL_DL_ConfigurationCommon->pattern2);
+ scc->tdd_UL_DL_ConfigurationCommon->pattern2 = NULL;
+ }
+
}
if ((int)*scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->msg1_SubcarrierSpacing == -1) {
@@ -995,8 +1002,6 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
if (num_gnbs>0) {
-
-
// Output a list of all gNBs. ////////// Identification parameters
config_getlist( &GNBParamList,GNBParams,sizeof(GNBParams)/sizeof(paramdef_t),NULL);
@@ -1161,6 +1166,7 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
NRRRC_CONFIGURATION_REQ (msg_p).pusch_AntennaPorts = *GNBParamList.paramarray[i][GNB_PUSCH_ANTENNAPORTS_IDX].iptr;
LOG_I(GNB_APP,"minTXRXTIME %d\n",*GNBParamList.paramarray[i][GNB_MINRXTXTIME_IDX].iptr);
NRRRC_CONFIGURATION_REQ (msg_p).minRXTXTIME = *GNBParamList.paramarray[i][GNB_MINRXTXTIME_IDX].iptr;
+ LOG_I(RRC,"SIB1 TDA %d\n",*GNBParamList.paramarray[i][GNB_SIB1_TDA_IDX].iptr);
NRRRC_CONFIGURATION_REQ (msg_p).sib1_tda = *GNBParamList.paramarray[i][GNB_SIB1_TDA_IDX].iptr;
LOG_I(GNB_APP,"Do CSI-RS %d\n",*GNBParamList.paramarray[i][GNB_DO_CSIRS_IDX].iptr);
NRRRC_CONFIGURATION_REQ (msg_p).do_CSIRS = *GNBParamList.paramarray[i][GNB_DO_CSIRS_IDX].iptr;
@@ -1168,7 +1174,6 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
NRRRC_CONFIGURATION_REQ (msg_p).do_SRS = *GNBParamList.paramarray[i][GNB_DO_SRS_IDX].iptr;
NRRRC_CONFIGURATION_REQ (msg_p).scc = scc;
NRRRC_CONFIGURATION_REQ (msg_p).scd = scd;
-
}//
}//End for (k=0; k <num_gnbs ; k++)
@@ -1220,7 +1225,7 @@ int RCconfig_nr_gtpu(void ) {
GTPV1U_REQ(message).localPort = port;
strcpy(GTPV1U_REQ(message).localAddrStr,address);
sprintf(GTPV1U_REQ(message).localPortStr,"%d", port);
- itti_send_msg_to_task (TASK_VARIABLE, 0, message); // data model is wrong: gtpu doesn't have enb_id (or module_id)
+ itti_send_msg_to_task (TASK_GTPV1_U, 0, message); // data model is wrong: gtpu doesn't have enb_id (or module_id)
} else
LOG_E(GTPU,"invalid address for NGU or S1U\n");
@@ -2033,6 +2038,7 @@ void configure_gnb_du_mac(int inst) {
rrc->configuration.pdsch_AntennaPorts,
rrc->configuration.pusch_AntennaPorts,
rrc->configuration.sib1_tda,
+ rrc->configuration.minRXTXTIME,
rrc->configuration.scc,
NULL,
0,
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_RA.c b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
index e62978782c90f770056441b5f49d0d441c287780..e5b95a7f470db7fb9422a2543bb3b53a0c9396cf 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_RA.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
@@ -34,7 +34,6 @@
#include "assertions.h"
#include "platform_types.h"
-#include "msc.h"
#include "LAYER2/MAC/mac.h"
#include "LAYER2/MAC/mac_extern.h"
@@ -1421,8 +1420,6 @@ cancel_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP,
rnti_t rnti) {
unsigned char i;
RA_t *ra = (RA_t *) & RC.mac[module_idP]->common_channels[CC_id].ra[0];
- MSC_LOG_EVENT(MSC_PHY_ENB, "RA Cancelling procedure ue %" PRIx16 " ",
- rnti);
LOG_D(MAC,
"[eNB %d][RAPROC] CC_id %d Frame %d Cancelling RA procedure for UE rnti %x\n",
module_idP, CC_id, frameP, rnti);
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
index 827d95dba5843c5e3d22ce259694620a85010246..6c9ffabd4f7e6b18aa173e30f040c0659d12e895 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
@@ -220,6 +220,11 @@ void dlsch_scheduler_pre_ue_select_fairRR(
continue;
}
+
+ if (UE_info->UE_sched_ctrl[UE_id].ul_failure_timer > 0
+ || UE_info->UE_sched_ctrl[UE_id].ul_out_of_sync == 1)
+ continue;
+
if(mac_eNB_get_rrc_status(module_idP,rnti) < RRC_CONNECTED) {
continue;
}
@@ -335,6 +340,10 @@ void dlsch_scheduler_pre_ue_select_fairRR(
if (rnti == NOT_A_RNTI)
continue;
+ if (UE_info->UE_sched_ctrl[UE_id].ul_failure_timer > 0
+ || UE_info->UE_sched_ctrl[UE_id].ul_out_of_sync == 1)
+ continue;
+
if(mac_eNB_get_rrc_status(module_idP,rnti) < RRC_CONNECTED) {
continue;
}
@@ -459,6 +468,10 @@ void dlsch_scheduler_pre_ue_select_fairRR(
if (rnti == NOT_A_RNTI)
continue;
+ if (UE_info->UE_sched_ctrl[UE_id].ul_failure_timer > 0
+ || UE_info->UE_sched_ctrl[UE_id].ul_out_of_sync == 1)
+ continue;
+
if(mac_eNB_get_rrc_status(module_idP,rnti) < RRC_CONNECTED) {
continue;
}
@@ -2241,7 +2254,8 @@ void ulsch_scheduler_pre_ue_select_fairRR(
if (UE_info->UE_template[CC_id][UE_id].configured == FALSE)
continue;
- if (UE_info->UE_sched_ctrl[UE_id].ul_out_of_sync == 1)
+ if (UE_info->UE_sched_ctrl[UE_id].ul_failure_timer > 0
+ || UE_info->UE_sched_ctrl[UE_id].ul_out_of_sync == 1)
continue;
// UL DCI
@@ -2403,7 +2417,8 @@ void ulsch_scheduler_pre_ue_select_fairRR(
if (UE_info->UE_template[CC_id][UE_id].configured == FALSE)
continue;
- if (UE_info->UE_sched_ctrl[UE_id].ul_out_of_sync == 1)
+ if (UE_info->UE_sched_ctrl[UE_id].ul_failure_timer > 0
+ || UE_info->UE_sched_ctrl[UE_id].ul_out_of_sync == 1)
continue;
if ( (ulsch_ue_select[CC_id].ue_num >= ulsch_ue_max_num[CC_id]) || (cc_id_flag[CC_id] == 1) ) {
@@ -2769,13 +2784,12 @@ void ulsch_scheduler_pre_processor_fairRR(module_id_t module_idP,
UE_info->UE_template[CC_id][UE_id].pre_allocated_rb_table_index_ul = 5;
UE_info->UE_template[CC_id][UE_id].pre_assigned_mcs_ul = 10;
} else {
- // assigne RBS( 3 RBs)
-/*
- first_rb[CC_id] = first_rb[CC_id] + 3;
- UE_info->UE_template[CC_id][UE_id].pre_allocated_nb_rb_ul = 3;
- UE_info->UE_template[CC_id][UE_id].pre_allocated_rb_table_index_ul = 2;
+ // assigne RBS( 5 RBs)
+ first_rb[CC_id] = first_rb[CC_id] + 5;
+ UE_info->UE_template[CC_id][UE_id].pre_allocated_nb_rb_ul = 5;
+ UE_info->UE_template[CC_id][UE_id].pre_allocated_rb_table_index_ul = 4;
UE_info->UE_template[CC_id][UE_id].pre_assigned_mcs_ul = 10;
-*/ }
+ }
}
} else if ( ulsch_ue_select[CC_id].list[ulsch_ue_num].ue_priority == SCH_UL_INACTIVE ) {
// assigne RBS( 3 RBs)
diff --git a/openair2/LAYER2/MAC/main.c b/openair2/LAYER2/MAC/main.c
index a4e924c68b7abc1474cb8e276346b3dffe0a3594..fa647454ba644df40df85a03dc76cbc768ecf1c6 100644
--- a/openair2/LAYER2/MAC/main.c
+++ b/openair2/LAYER2/MAC/main.c
@@ -68,7 +68,7 @@ void *mac_stats_thread(void *param) {
else {
total_bler = (double)UE_scheduling_control->pusch_rx_error_num[CC_id] / (double)(UE_scheduling_control->pusch_rx_error_num[CC_id] + UE_scheduling_control->pusch_rx_num[CC_id]) * 100;
}
- fprintf(fd,"MAC UE rnti %x : %s, PHR %d DLCQI %d PUSCH %d PUCCH %d RLC disc %d UL-stat rcv %lu err %lu bler %lf (%lf/%lf) total_bler %lf mcsoff %d pre_allocated nb_rb %d, mcs %d, bsr %u sched %u tbs %lu cnt %u , DL-stat tbs %lu cnt %u rb %u buf %u 1st %u ret %u ri %d\n",
+ fprintf(fd,"MAC UE rnti %x : %s, PHR %d DLCQI %d PUSCH %d PUCCH %d RLC disc %d UL-stat rcv %lu err %lu bler %lf (%lf/%lf) total_bler %lf mcsoff %d pre_allocated nb_rb %d, mcs %d, bsr %u sched %u tbs %lu cnt %u , DL-stat tbs %lu cnt %u rb %u buf %u 1st %u ret %u ri %d inactivity timer %d\n",
rnti,
UE_scheduling_control->ul_out_of_sync == 0 ? "in synch" : "out of sync",
UE_info->UE_template[CC_id][UE_id].phr_info,
@@ -97,7 +97,8 @@ void *mac_stats_thread(void *param) {
#endif
UE_scheduling_control->first_cnt[CC_id],
UE_scheduling_control->ret_cnt[CC_id],
- UE_scheduling_control->aperiodic_ri_received[CC_id]
+ UE_scheduling_control->aperiodic_ri_received[CC_id],
+ UE_scheduling_control->ul_inactivity_timer
);
fprintf(fd," ULSCH rounds %d/%d/%d/%d, DLSCH rounds %d/%d/%d/%d, ULSCH errors %d, DLSCH errors %d\n",
UE_info->eNB_UE_stats[CC_id][UE_id].ulsch_rounds[0],
@@ -215,7 +216,6 @@ void mac_init_cell_params(int Mod_idP, int CC_idP)
int j;
UE_TEMPLATE *UE_template;
- LOG_D(MAC, "[MSC_NEW][FRAME 00000][MAC_eNB][MOD %02d][]\n", Mod_idP);
//COMMON_channels_t *cc = &RC.mac[Mod_idP]->common_channels[CC_idP];
memset(&RC.mac[Mod_idP]->eNB_stats, 0, sizeof(eNB_STATS));
diff --git a/openair2/LAYER2/MAC/ra_procedures.c b/openair2/LAYER2/MAC/ra_procedures.c
index 1aa959e103450f7b759585523c7959bdb933cc1f..af68cebbe1ab8776dde2fb4b5bb29bdb081ffdec 100644
--- a/openair2/LAYER2/MAC/ra_procedures.c
+++ b/openair2/LAYER2/MAC/ra_procedures.c
@@ -348,7 +348,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
Size16 = (uint16_t) Size;
// LOG_D(MAC,"[UE %d] Frame %d: Requested RRCConnectionRequest, got %d bytes\n",module_idP,frameP,Size);
LOG_I(RRC,
- "[MSC_MSG][FRAME %05d][RRC_UE][MOD %02d][][--- MAC_DATA_REQ (RRCConnectionRequest eNB %d) --->][MAC_UE][MOD %02d][]\n",
+ "[FRAME %05d][RRC_UE][MOD %02d][][--- MAC_DATA_REQ (RRCConnectionRequest eNB %d) --->][MAC_UE][MOD %02d][]\n",
frameP, module_idP, eNB_indexP, module_idP);
LOG_I(MAC,
"[UE %d] Frame %d: Requested RRCConnectionRequest, got %d bytes\n",
diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c b/openair2/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c
index 4fcbd322dbfb924b796c0139c86dd45d5f9f9e8c..c33946fa5ac781a95c795e122cb498d765de373b 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c
@@ -51,7 +51,7 @@ uint32_t nr_compute_tbs(uint16_t Qm,
uint32_t Ninfo, Np_info, C;
uint8_t n, scale;
- LOG_D(NR_MAC,"nb_symb_sch %d, nb_dmrs_prb %d, nb_rb_oh %d\n",nb_symb_sch,nb_dmrs_prb,nb_rb_oh);
+ LOG_D(NR_MAC, "In %s: nb_symb_sch %d, nb_dmrs_prb %d, nb_rb %d, nb_rb_oh %d, tb_scaling %d Nl %d\n", __FUNCTION__, nb_symb_sch, nb_dmrs_prb, nb_rb, nb_rb_oh, tb_scaling, Nl);
nbp_re = NR_NB_SC_PER_RB * nb_symb_sch - nb_dmrs_prb - nb_rb_oh;
nb_re = min(156, nbp_re) * nb_rb;
@@ -86,7 +86,7 @@ uint32_t nr_compute_tbs(uint16_t Qm,
}
}
- LOG_D(NR_MAC, "In %s: Ninfo %d nbp_re %d nb_re %d Qm %d, R %d, tbs %d\n", __FUNCTION__, Ninfo, nbp_re, nb_re, Qm, R, nr_tbs);
+ LOG_D(NR_MAC, "In %s: Ninfo %d nbp_re %d nb_re %d Qm %d, R %d, tbs %d bits\n", __FUNCTION__, Ninfo, nbp_re, nb_re, Qm, R, nr_tbs);
return nr_tbs;
diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
index 2fd8534b9b51857e54523eade2048d7d8d08c07c..94b7ab18bfda7e0f9b0a08240bc09204814151e6 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
@@ -315,21 +315,21 @@ void get_info_from_tda_tables(int default_abc,
int tda,
int dmrs_TypeA_Position,
int normal_CP,
+ bool *is_mapping_typeA,
int *startSymbolIndex,
int *nrOfSymbols) {
int k0 = 0;
- int is_mapping_typeA = 1;
switch(default_abc){
case 1:
if (normal_CP){
if (dmrs_TypeA_Position){
- is_mapping_typeA = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[tda][0];
+ *is_mapping_typeA = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[tda][0];
k0 = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[tda][1];
*startSymbolIndex = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[tda][2];
*nrOfSymbols = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[tda][3];
}
else{
- is_mapping_typeA = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[tda][0];
+ *is_mapping_typeA = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[tda][0];
k0 = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[tda][1];
*startSymbolIndex = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[tda][2];
*nrOfSymbols = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[tda][3];
@@ -337,13 +337,13 @@ void get_info_from_tda_tables(int default_abc,
}
else{
if (dmrs_TypeA_Position){
- is_mapping_typeA = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos3[tda][0];
+ *is_mapping_typeA = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos3[tda][0];
k0 = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos3[tda][1];
*startSymbolIndex = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos3[tda][2];
*nrOfSymbols = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos3[tda][3];
}
else{
- is_mapping_typeA = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos2[tda][0];
+ *is_mapping_typeA = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos2[tda][0];
k0 = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos2[tda][1];
*startSymbolIndex = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos2[tda][2];
*nrOfSymbols = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos2[tda][3];
@@ -352,13 +352,13 @@ void get_info_from_tda_tables(int default_abc,
break;
case 2:
if (dmrs_TypeA_Position){
- is_mapping_typeA = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos3[tda][0];
+ *is_mapping_typeA = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos3[tda][0];
k0 = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos3[tda][1];
*startSymbolIndex = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos3[tda][2];
*nrOfSymbols = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos3[tda][3];
}
else{
- is_mapping_typeA = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos2[tda][0];
+ *is_mapping_typeA = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos2[tda][0];
k0 = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos2[tda][1];
*startSymbolIndex = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos2[tda][2];
*nrOfSymbols = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos2[tda][3];
@@ -366,13 +366,13 @@ void get_info_from_tda_tables(int default_abc,
break;
case 3:
if (dmrs_TypeA_Position){
- is_mapping_typeA = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos3[tda][0];
+ *is_mapping_typeA = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos3[tda][0];
k0 = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos3[tda][1];
*startSymbolIndex = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos3[tda][2];
*nrOfSymbols = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos3[tda][3];
}
else{
- is_mapping_typeA = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos2[tda][0];
+ *is_mapping_typeA = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos2[tda][0];
k0 = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos2[tda][1];
*startSymbolIndex = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos2[tda][2];
*nrOfSymbols = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos2[tda][3];
@@ -382,7 +382,6 @@ void get_info_from_tda_tables(int default_abc,
AssertFatal(1==0,"Invalid default time domaing allocation type\n");
}
AssertFatal(k0==0,"Only k0 = 0 is supported\n");
- AssertFatal(is_mapping_typeA==1,"Only mapping type A is currently supported\n");
}
const char *prachfmt[]={"0","1","2","3", "A1","A2","A3","B1","B4","C0","C2","A1/B1","A2/B2","A3/B3"};
@@ -1725,9 +1724,11 @@ int get_nr_prach_info_from_index(uint8_t index,
subframe = slot >> mu;
s_map = table_6_3_3_2_2_prachConfig_Index[index][4];
if ( (s_map>>subframe)&0x01 ) {
+ *N_RA_slot = table_6_3_3_2_2_prachConfig_Index[index][6]; // Number of RACH slots within a subframe
if (mu == 1) {
- if ( (table_6_3_3_2_2_prachConfig_Index[index][6] <= 1) && (slot%2 == 0) )
+ if ((*N_RA_slot <= 1) && (slot % 2 == 0)){
return 0; // no prach in even slots @ 30kHz for 1 prach per subframe
+ }
}
for(int i = 0; i <= subframe ; i++) {
if ( (s_map >> i) & 0x01) {
@@ -1736,6 +1737,7 @@ int get_nr_prach_info_from_index(uint8_t index,
}
if (start_symbol != NULL && N_t_slot != NULL && N_dur != NULL && format != NULL){
*start_symbol = table_6_3_3_2_2_prachConfig_Index[index][5];
+ *config_period = x;
*N_t_slot = table_6_3_3_2_2_prachConfig_Index[index][7];
*N_dur = table_6_3_3_2_2_prachConfig_Index[index][8];
if (table_6_3_3_2_2_prachConfig_Index[index][1] != -1)
@@ -2391,7 +2393,14 @@ int32_t get_l_prime(uint8_t duration_in_symbols, uint8_t mapping_type, pusch_dmr
uint8_t row, colomn;
int32_t l_prime;
- LOG_D(NR_MAC, "PUSCH: NrofSymbols:%d, startSymbol:%d, mappingtype:%d, dmrs_TypeA_Position:%d\n", duration_in_symbols, start_symbol, mapping_type, dmrs_typeA_position);
+ LOG_D(NR_MAC, "In %s: PUSCH NrofSymbols:%d, startSymbol:%d, mappingtype:%d, dmrs_TypeA_Position:%d additional_pos:%d, pusch_maxLength:%d\n",
+ __FUNCTION__,
+ duration_in_symbols,
+ start_symbol,
+ mapping_type,
+ dmrs_typeA_position,
+ additional_pos,
+ pusch_maxLength);
// Section 6.4.1.1.3 in Spec 38.211
// For PDSCH Mapping TypeA, ld is duration between first OFDM of the slot and last OFDM symbol of the scheduled PUSCH resources
@@ -2711,6 +2720,7 @@ uint16_t nr_dci_size(const NR_BWP_DownlinkCommon_t *initialDownlinkBWP,
LOG_D(NR_MAC,"DAI1 nbits %d\n",dci_pdu->dai[0].nbits);
// 2nd DAI
if (cg->spCellConfig->spCellConfigDedicated->pdsch_ServingCellConfig &&
+ cg->spCellConfig->spCellConfigDedicated->pdsch_ServingCellConfig->choice.setup &&
cg->spCellConfig->spCellConfigDedicated->pdsch_ServingCellConfig->choice.setup->codeBlockGroupTransmission != NULL) { //TODO not sure about that
dci_pdu->dai[1].nbits = 2;
size += dci_pdu->dai[1].nbits;
@@ -2981,7 +2991,8 @@ uint16_t nr_dci_size(const NR_BWP_DownlinkCommon_t *initialDownlinkBWP,
dci_pdu->srs_request.nbits = 3;
size += dci_pdu->srs_request.nbits;
// CBGTI
- if (cg->spCellConfig->spCellConfigDedicated->pdsch_ServingCellConfig&&
+ if (cg->spCellConfig->spCellConfigDedicated->pdsch_ServingCellConfig &&
+ cg->spCellConfig->spCellConfigDedicated->pdsch_ServingCellConfig->choice.setup &&
cg->spCellConfig->spCellConfigDedicated->pdsch_ServingCellConfig->choice.setup->codeBlockGroupTransmission != NULL) {
uint8_t maxCBGperTB = (cg->spCellConfig->spCellConfigDedicated->pdsch_ServingCellConfig->choice.setup->codeBlockGroupTransmission->choice.setup->maxCodeBlockGroupsPerTransportBlock + 1) * 2;
long *maxCWperDCI_rrc = pdsch_Config->maxNrofCodeWordsScheduledByDCI;
@@ -3326,65 +3337,65 @@ uint16_t get_ssb_start_symbol(const long band, NR_SubcarrierSpacing_t scs, int i
void csi_period_offset(NR_CSI_ReportConfig_t *csirep,
- NR_NZP_CSI_RS_Resource_t *nzpcsi,
+ struct NR_CSI_ResourcePeriodicityAndOffset *periodicityAndOffset,
int *period, int *offset) {
- if(nzpcsi != NULL) {
+ if(periodicityAndOffset != NULL) {
- NR_CSI_ResourcePeriodicityAndOffset_PR p_and_o = nzpcsi->periodicityAndOffset->present;
+ NR_CSI_ResourcePeriodicityAndOffset_PR p_and_o = periodicityAndOffset->present;
switch(p_and_o){
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots4:
*period = 4;
- *offset = nzpcsi->periodicityAndOffset->choice.slots4;
+ *offset = periodicityAndOffset->choice.slots4;
break;
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots5:
*period = 5;
- *offset = nzpcsi->periodicityAndOffset->choice.slots5;
+ *offset = periodicityAndOffset->choice.slots5;
break;
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots8:
*period = 8;
- *offset = nzpcsi->periodicityAndOffset->choice.slots8;
+ *offset = periodicityAndOffset->choice.slots8;
break;
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots10:
*period = 10;
- *offset = nzpcsi->periodicityAndOffset->choice.slots10;
+ *offset = periodicityAndOffset->choice.slots10;
break;
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots16:
*period = 16;
- *offset = nzpcsi->periodicityAndOffset->choice.slots16;
+ *offset = periodicityAndOffset->choice.slots16;
break;
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots20:
*period = 20;
- *offset = nzpcsi->periodicityAndOffset->choice.slots20;
+ *offset = periodicityAndOffset->choice.slots20;
break;
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots32:
*period = 32;
- *offset = nzpcsi->periodicityAndOffset->choice.slots32;
+ *offset = periodicityAndOffset->choice.slots32;
break;
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots40:
*period = 40;
- *offset = nzpcsi->periodicityAndOffset->choice.slots40;
+ *offset = periodicityAndOffset->choice.slots40;
break;
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots64:
*period = 64;
- *offset = nzpcsi->periodicityAndOffset->choice.slots64;
+ *offset = periodicityAndOffset->choice.slots64;
break;
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots80:
*period = 80;
- *offset = nzpcsi->periodicityAndOffset->choice.slots80;
+ *offset = periodicityAndOffset->choice.slots80;
break;
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots160:
*period = 160;
- *offset = nzpcsi->periodicityAndOffset->choice.slots160;
+ *offset = periodicityAndOffset->choice.slots160;
break;
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots320:
*period = 320;
- *offset = nzpcsi->periodicityAndOffset->choice.slots320;
+ *offset = periodicityAndOffset->choice.slots320;
break;
case NR_CSI_ResourcePeriodicityAndOffset_PR_slots640:
*period = 640;
- *offset = nzpcsi->periodicityAndOffset->choice.slots640;
+ *offset = periodicityAndOffset->choice.slots640;
break;
default:
AssertFatal(1==0,"No periodicity and offset found in CSI resource");
@@ -4139,4 +4150,3 @@ bool set_ul_ptrs_values(NR_PTRS_UplinkConfig_t *ul_ptrs_config,
}
return valid;
}
-
diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
index f96abb46e5178066b170aebc67dc51afeab57098..c150c4f134aecb73181bb89c789b8b94e941c7b1 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
@@ -140,6 +140,7 @@ void get_info_from_tda_tables(int default_abc,
int tda,
int dmrs_TypeA_Position,
int normal_CP,
+ bool *is_mapping_typeA,
int *startSymbolIndex,
int *nrOfSymbols);
@@ -160,7 +161,7 @@ int16_t get_N_RA_RB (int delta_f_RA_PRACH,int delta_f_PUSCH);
void find_period_offest_SR (NR_SchedulingRequestResourceConfig_t *SchedulingReqRec, int *period, int *offset);
void csi_period_offset(NR_CSI_ReportConfig_t *csirep,
- NR_NZP_CSI_RS_Resource_t *nzpcsi,
+ struct NR_CSI_ResourcePeriodicityAndOffset *periodicityAndOffset,
int *period, int *offset);
void reverse_n_bits(uint8_t *value, uint16_t bitlen);
diff --git a/openair2/LAYER2/NR_MAC_UE/config_ue.c b/openair2/LAYER2/NR_MAC_UE/config_ue.c
index b03c8fa55fa4ad56746e132e0796877892592838..3b10167e03c33d2f46c070130e91fb204dade024 100644
--- a/openair2/LAYER2/NR_MAC_UE/config_ue.c
+++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c
@@ -38,16 +38,18 @@
#include "common/utils/nr/nr_common.h"
#include "executables/softmodem-common.h"
-int set_tdd_config_nr_ue(fapi_nr_config_request_t *cfg,
- int mu,
- int nrofDownlinkSlots, int nrofDownlinkSymbols,
- int nrofUplinkSlots, int nrofUplinkSymbols) {
-
+void set_tdd_config_nr_ue(fapi_nr_config_request_t *cfg,
+ int mu,
+ NR_TDD_UL_DL_ConfigCommon_t *tdd_config) {
+
+ const int nrofDownlinkSlots = tdd_config->pattern1.nrofDownlinkSlots;
+ const int nrofDownlinkSymbols = tdd_config->pattern1.nrofDownlinkSymbols;
+ const int nrofUplinkSlots = tdd_config->pattern1.nrofUplinkSlots;
+ const int nrofUplinkSymbols = tdd_config->pattern1.nrofUplinkSymbols;
int slot_number = 0;
- int nb_periods_per_frame = get_nb_periods_per_frame(cfg->tdd_table.tdd_period);
- int nb_slots_to_set = TDD_CONFIG_NB_FRAMES*(1<<mu)*NR_NUMBER_OF_SUBFRAMES_PER_FRAME;
-
- int nb_slots_per_period = ((1<<mu) * NR_NUMBER_OF_SUBFRAMES_PER_FRAME)/nb_periods_per_frame;
+ const int nb_periods_per_frame = get_nb_periods_per_frame(tdd_config->pattern1.dl_UL_TransmissionPeriodicity);
+ const int nb_slots_to_set = TDD_CONFIG_NB_FRAMES*(1<<mu)*NR_NUMBER_OF_SUBFRAMES_PER_FRAME;
+ const int nb_slots_per_period = ((1<<mu) * NR_NUMBER_OF_SUBFRAMES_PER_FRAME)/nb_periods_per_frame;
cfg->tdd_table.tdd_period_in_slots = nb_slots_per_period;
if ( (nrofDownlinkSymbols + nrofUplinkSymbols) == 0 )
@@ -103,7 +105,15 @@ int set_tdd_config_nr_ue(fapi_nr_config_request_t *cfg,
}
}
- return (0);
+ if (tdd_config->pattern1.ext1 == NULL) {
+ cfg->tdd_table.tdd_period = tdd_config->pattern1.dl_UL_TransmissionPeriodicity;
+ } else {
+ AssertFatal(tdd_config->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 != NULL, "scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 is null\n");
+ cfg->tdd_table.tdd_period = *tdd_config->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530;
+ }
+
+ LOG_I(NR_MAC, "TDD has been properly configured\n");
+
}
@@ -191,27 +201,10 @@ void config_common_ue_sa(NR_UE_MAC_INST_t *mac,
}
// TDD Table Configuration
- if (scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1 == NULL)
- cfg->tdd_table.tdd_period = scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity;
- else {
- AssertFatal(scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 != NULL,
- "scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 is null\n");
- cfg->tdd_table.tdd_period = *scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530;
- }
- if(cfg->cell_config.frame_duplex_type == TDD){
- LOG_I(MAC,"Setting TDD configuration period to %d\n", cfg->tdd_table.tdd_period);
- int return_tdd = set_tdd_config_nr_ue(cfg,
- scc->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
- scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSlots,
- scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSymbols,
- scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots,
- scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols
- );
-
- if (return_tdd !=0)
- LOG_E(PHY,"TDD configuration can not be done\n");
- else
- LOG_I(PHY,"TDD has been properly configurated\n");
+ if (cfg->cell_config.frame_duplex_type == TDD){
+ set_tdd_config_nr_ue(cfg,
+ scc->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
+ scc->tdd_UL_DL_ConfigurationCommon);
}
// PRACH configuration
@@ -374,31 +367,13 @@ void config_common_ue(NR_UE_MAC_INST_t *mac,
}
// TDD Table Configuration
- if (scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1 == NULL)
- cfg->tdd_table.tdd_period = scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity;
- else {
- AssertFatal(scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 != NULL,
- "scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 is null\n");
- cfg->tdd_table.tdd_period = *scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530;
+ if (cfg->cell_config.frame_duplex_type == TDD){
+ set_tdd_config_nr_ue(cfg,
+ scc->uplinkConfigCommon->frequencyInfoUL->scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
+ scc->tdd_UL_DL_ConfigurationCommon);
}
- if(cfg->cell_config.frame_duplex_type == TDD){
- LOG_I(MAC,"Setting TDD configuration period to %d\n", cfg->tdd_table.tdd_period);
- int return_tdd = set_tdd_config_nr_ue(cfg,
- scc->uplinkConfigCommon->frequencyInfoUL->scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
- scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSlots,
- scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSymbols,
- scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots,
- scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols
- );
-
- if (return_tdd !=0)
- LOG_E(PHY,"TDD configuration can not be done\n");
- else
- LOG_I(PHY,"TDD has been properly configurated\n");
- }
-
+
// PRACH configuration
-
uint8_t nb_preambles = 64;
if(scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->totalNumberOfRA_Preambles != NULL)
nb_preambles = *scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->totalNumberOfRA_Preambles;
@@ -603,6 +578,7 @@ int nr_rrc_mac_config_req_ue(
NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
RA_config_t *ra = &mac->ra;
+ fapi_nr_config_request_t *cfg = &mac->phy_config.config_req;
// TODO do something FAPI-like P5 L1/L2 config interface in config_si, config_mib, etc.
@@ -617,11 +593,17 @@ int nr_rrc_mac_config_req_ue(
if (sccP != NULL) {
mac->scc_SIB=sccP;
- LOG_D(MAC,"Keeping ServingCellConfigCommonSIB\n");
+ LOG_D(NR_MAC, "In %s: Keeping ServingCellConfigCommonSIB\n", __FUNCTION__);
config_common_ue_sa(mac,module_id,cc_idP);
- int num_slots_ul = mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
- if (mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols>0) num_slots_ul++;
- LOG_I(MAC, "Initializing ul_config_request. num_slots_ul = %d\n", num_slots_ul);
+
+ int num_slots_ul = nr_slots_per_frame[mac->mib->subCarrierSpacingCommon];
+ if(cfg->cell_config.frame_duplex_type == TDD){
+ num_slots_ul = mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
+ if (mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols > 0) {
+ num_slots_ul++;
+ }
+ }
+ LOG_I(NR_MAC, "Initializing ul_config_request. num_slots_ul = %d\n", num_slots_ul);
mac->ul_config_request = (fapi_nr_ul_config_request_t *)calloc(num_slots_ul, sizeof(fapi_nr_ul_config_request_t));
for (int i=0; i<num_slots_ul; i++)
pthread_mutex_init(&(mac->ul_config_request[i].mutex_ul_config), NULL);
diff --git a/openair2/LAYER2/NR_MAC_UE/mac_proto.h b/openair2/LAYER2/NR_MAC_UE/mac_proto.h
index 288716ed851b0a5da0c79a25be16cc8ed6339840..3e4d53b985be0ae4270287fed9ef0e5d7ec2e4e4 100644
--- a/openair2/LAYER2/NR_MAC_UE/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_proto.h
@@ -214,6 +214,7 @@ uint8_t get_ssb_rsrp_payload(NR_UE_MAC_INST_t *mac,
uint8_t nr_get_csi_payload(NR_UE_MAC_INST_t *mac,
PUCCH_sched_t *pucch,
+ int csi_report_id,
NR_CSI_MeasConfig_t *csi_MeasConfig);
uint8_t get_rsrp_index(int rsrp);
@@ -271,6 +272,7 @@ int8_t nr_ue_process_dci_time_dom_resource_assignment(NR_UE_MAC_INST_t *mac,
NR_PDSCH_TimeDomainResourceAllocationList_t *pdsch_TimeDomainAllocationList,
nfapi_nr_ue_pusch_pdu_t *pusch_config_pdu,
fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu,
+ int *mappingtype,
uint8_t time_domain_ind,
int default_abc,
bool use_default);
@@ -283,9 +285,9 @@ uint8_t nr_ue_get_sdu(module_id_t module_idP,
uint8_t *ulsch_buffer,
uint16_t buflen);
-int set_tdd_config_nr_ue(fapi_nr_config_request_t *cfg, int mu,
- int nrofDownlinkSlots, int nrofDownlinkSymbols,
- int nrofUplinkSlots, int nrofUplinkSymbols);
+void set_tdd_config_nr_ue(fapi_nr_config_request_t *cfg,
+ int mu,
+ NR_TDD_UL_DL_ConfigCommon_t *tdd_config);
void set_harq_status(NR_UE_MAC_INST_t *mac,
uint8_t pucch_id,
@@ -350,6 +352,8 @@ and fills the PRACH PDU per each FD occasion.
*/
void nr_ue_prach_scheduler(module_id_t module_idP, frame_t frameP, sub_frame_t slotP, int thread_id);
void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, int thread_id);
+void nr_schedule_csirs_reception(NR_UE_MAC_INST_t *mac, int frame, int slot);
+void nr_schedule_csi_for_im(NR_UE_MAC_INST_t *mac, int frame, int slot);
/* \brief This function schedules the Msg3 transmission
@param
diff --git a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
index 73b5a35b623ffa45fa88477b15edd3ab5ad2810c..4adee2bced396dae590bb5948aac0cccd36151a2 100644
--- a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
+++ b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
@@ -70,10 +70,12 @@ NR_UE_MAC_INST_t * nr_l2_init_ue(NR_UE_RRC_INST_t* rrc_inst) {
// point to a list of structures (one for each UL slot) to store PUSCH scheduling parameters
// received from UL DCI.
if (nr_ue_mac_inst->scc) {
- int num_slots_ul = nr_ue_mac_inst->scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
- if (nr_ue_mac_inst->scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols>0)
+ NR_TDD_UL_DL_ConfigCommon_t *tdd = nr_ue_mac_inst->scc->tdd_UL_DL_ConfigurationCommon;
+ int num_slots_ul = tdd ? tdd->pattern1.nrofUplinkSlots : nr_slots_per_frame[*nr_ue_mac_inst->scc->ssbSubcarrierSpacing];
+ if (tdd && nr_ue_mac_inst->scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols > 0) {
num_slots_ul++;
- LOG_D(MAC, "Initializing ul_config_request. num_slots_ul = %d\n", num_slots_ul);
+ }
+ LOG_D(NR_MAC, "In %s: Initializing ul_config_request. num_slots_ul = %d\n", __FUNCTION__, num_slots_ul);
nr_ue_mac_inst->ul_config_request = (fapi_nr_ul_config_request_t *)calloc(num_slots_ul, sizeof(fapi_nr_ul_config_request_t));
for (int i=0; i<num_slots_ul; i++)
pthread_mutex_init(&(nr_ue_mac_inst->ul_config_request[i].mutex_ul_config), NULL);
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_l1_helpers.c b/openair2/LAYER2/NR_MAC_UE/nr_l1_helpers.c
index eaaa5f5f7222777acbdcf35cee5a18897f7fac6c..2d704b5c817bdf73e38bd7eb8b413adb3208f8ba 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_l1_helpers.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_l1_helpers.c
@@ -38,7 +38,6 @@
#include "LAYER2/NR_MAC_UE/nr_l1_helpers.h"
#include "NR_P-Max.h"
-
// Implementation of 6.2.4 Configured ransmitted power
// 3GPP TS 38.101-1 version 16.5.0 Release 16
// -
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
index 5f2c839ac19263cb35011077757c6b1c7806be9e..9270540d261b604e8f1e0b3bd159e285be935c6d 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
@@ -470,6 +470,7 @@ int8_t nr_ue_process_dci_time_dom_resource_assignment(NR_UE_MAC_INST_t *mac,
NR_PDSCH_TimeDomainResourceAllocationList_t *pdsch_TimeDomainAllocationList,
nfapi_nr_ue_pusch_pdu_t *pusch_config_pdu,
fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu,
+ int *mapping_type,
uint8_t time_domain_ind,
int default_abc,
bool use_default){
@@ -547,13 +548,15 @@ int8_t nr_ue_process_dci_time_dom_resource_assignment(NR_UE_MAC_INST_t *mac,
}
else {// Default configuration from tables
+ bool is_typeA;
get_info_from_tda_tables(default_abc,
time_domain_ind,
dmrs_typeA_pos,
1, // normal CP
+ &is_typeA,
&sliv_S,
&sliv_L);
-
+ *mapping_type = is_typeA? typeA : typeB;
dlsch_config_pdu->number_symbols = sliv_L;
dlsch_config_pdu->start_symbol = sliv_S;
}
@@ -859,12 +862,17 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
else if (mac->scc_SIB && mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP.pdsch_ConfigCommon->choice.setup)
pdsch_TimeDomainAllocationList = mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP.pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList;
+ int mappingtype;
/* TIME_DOM_RESOURCE_ASSIGNMENT */
- if (nr_ue_process_dci_time_dom_resource_assignment(mac,NULL,pdsch_TimeDomainAllocationList,NULL,dlsch_config_pdu_1_0,dci->time_domain_assignment.val,default_abc,rnti==SI_RNTI) < 0) {
+ if (nr_ue_process_dci_time_dom_resource_assignment(mac,NULL,pdsch_TimeDomainAllocationList,
+ NULL,dlsch_config_pdu_1_0,&mappingtype,
+ dci->time_domain_assignment.val,
+ default_abc,rnti==SI_RNTI) < 0) {
LOG_W(MAC, "[%d.%d] Invalid time_domain_assignment. Possibly due to false DCI. Ignoring DCI!\n", frame, slot);
return -1;
}
- int mappingtype = pdsch_TimeDomainAllocationList ? pdsch_TimeDomainAllocationList->list.array[dci->time_domain_assignment.val]->mappingType : ((dlsch_config_pdu_1_0->start_symbol <= 3)? typeA: typeB);
+ if(pdsch_TimeDomainAllocationList && rnti!=SI_RNTI)
+ mappingtype = pdsch_TimeDomainAllocationList->list.array[dci->time_domain_assignment.val]->mappingType;
/* dmrs symbol positions*/
dlsch_config_pdu_1_0->dlDmrsSymbPos = fill_dmrs_mask(pdsch_config,
@@ -1056,13 +1064,16 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
return -1;
}
/* TIME_DOM_RESOURCE_ASSIGNMENT */
+ int mappingtype;
NR_PDSCH_TimeDomainResourceAllocationList_t *pdsch_TimeDomainAllocationList = choose_dl_tda_list(pdsch_Config,bwpc->pdsch_ConfigCommon->choice.setup);
- if (nr_ue_process_dci_time_dom_resource_assignment(mac,NULL,pdsch_TimeDomainAllocationList,NULL,dlsch_config_pdu_1_1,dci->time_domain_assignment.val,0,false) < 0) {
+ if (nr_ue_process_dci_time_dom_resource_assignment(mac,NULL,pdsch_TimeDomainAllocationList,
+ NULL,dlsch_config_pdu_1_1,&mappingtype,
+ dci->time_domain_assignment.val,0,false) < 0) {
LOG_W(MAC, "[%d.%d] Invalid time_domain_assignment. Possibly due to false DCI. Ignoring DCI!\n", frame, slot);
return -1;
}
-
- int mappingtype = pdsch_TimeDomainAllocationList ? pdsch_TimeDomainAllocationList->list.array[dci->time_domain_assignment.val]->mappingType : ((dlsch_config_pdu_1_1->start_symbol <= 3)? typeA: typeB);
+ if(pdsch_TimeDomainAllocationList)
+ mappingtype = pdsch_TimeDomainAllocationList->list.array[dci->time_domain_assignment.val]->mappingType;
dlsch_config_pdu_1_1->dmrsConfigType = pdsch_Config->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type == NULL ? NFAPI_NR_DMRS_TYPE1 : NFAPI_NR_DMRS_TYPE2;
@@ -1270,7 +1281,7 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
feedback_ti,
dci->dai[0].val,
dci_ind->n_CCE,dci_ind->N_CCE,
- 0, frame,slot);
+ 0,frame,slot);
dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_DLSCH;
LOG_D(MAC,"(nr_ue_procedures.c) pdu_type=%d\n\n",dl_config->dl_config_list[dl_config->number_pdus].pdu_type);
@@ -2393,7 +2404,7 @@ uint8_t nr_get_csi_measurements(NR_UE_MAC_INST_t *mac,
"CSI resource not found among PUCCH resources\n");
pucch->resource_indicator = found;
- csi_bits = nr_get_csi_payload(mac, pucch, csi_measconfig);
+ csi_bits += nr_get_csi_payload(mac, pucch, csi_report_id, csi_measconfig);
}
}
else
@@ -2407,31 +2418,30 @@ uint8_t nr_get_csi_measurements(NR_UE_MAC_INST_t *mac,
uint8_t nr_get_csi_payload(NR_UE_MAC_INST_t *mac,
PUCCH_sched_t *pucch,
+ int csi_report_id,
NR_CSI_MeasConfig_t *csi_MeasConfig) {
int n_csi_bits = 0;
AssertFatal(csi_MeasConfig->csi_ReportConfigToAddModList->list.count>0,"No CSI Report configuration available\n");
- for (int csi_report_id=0; csi_report_id < csi_MeasConfig->csi_ReportConfigToAddModList->list.count; csi_report_id++){
- struct NR_CSI_ReportConfig *csi_reportconfig = csi_MeasConfig->csi_ReportConfigToAddModList->list.array[csi_report_id];
- NR_CSI_ResourceConfigId_t csi_ResourceConfigId = csi_reportconfig->resourcesForChannelMeasurement;
- switch(csi_reportconfig->reportQuantity.present) {
- case NR_CSI_ReportConfig__reportQuantity_PR_none:
- break;
- case NR_CSI_ReportConfig__reportQuantity_PR_ssb_Index_RSRP:
- n_csi_bits += get_ssb_rsrp_payload(mac,pucch,csi_reportconfig,csi_ResourceConfigId,csi_MeasConfig);
- break;
- case NR_CSI_ReportConfig__reportQuantity_PR_cri_RSRP:
- case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_PMI_CQI:
- case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_i1:
- case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_i1_CQI:
- case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_CQI:
- case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_LI_PMI_CQI:
- AssertFatal(1==0,"Measurement report based on CSI-RS not availalble\n");
- default:
- AssertFatal(1==0,"Invalid CSI report quantity type %d\n",csi_reportconfig->reportQuantity.present);
- }
+ struct NR_CSI_ReportConfig *csi_reportconfig = csi_MeasConfig->csi_ReportConfigToAddModList->list.array[csi_report_id];
+ NR_CSI_ResourceConfigId_t csi_ResourceConfigId = csi_reportconfig->resourcesForChannelMeasurement;
+ switch(csi_reportconfig->reportQuantity.present) {
+ case NR_CSI_ReportConfig__reportQuantity_PR_none:
+ break;
+ case NR_CSI_ReportConfig__reportQuantity_PR_ssb_Index_RSRP:
+ n_csi_bits = get_ssb_rsrp_payload(mac,pucch,csi_reportconfig,csi_ResourceConfigId,csi_MeasConfig);
+ break;
+ case NR_CSI_ReportConfig__reportQuantity_PR_cri_RSRP:
+ case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_PMI_CQI:
+ case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_i1:
+ case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_i1_CQI:
+ case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_CQI:
+ case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_LI_PMI_CQI:
+ AssertFatal(1==0,"Measurement report based on CSI-RS not availalble\n");
+ default:
+ AssertFatal(1==0,"Invalid CSI report quantity type %d\n",csi_reportconfig->reportQuantity.present);
}
return (n_csi_bits);
}
@@ -3833,6 +3843,21 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
LOG_A(NR_MAC, "[UE %d][RAPROC][%d.%d] Found RAR with the intended RAPID %d\n", mod_id, frame, slot, rarh->RAPID);
rar = (NR_MAC_RAR *) (dlsch_buffer + n_subheaders + (n_subPDUs - 1) * sizeof(NR_MAC_RAR));
ra->RA_RAPID_found = 1;
+ if (get_softmodem_params()->emulate_l1) {
+ /* When we are emulating L1 with multiple UEs, the rx_indication will have
+ multiple RAR PDUs. The code would previously handle each of these PDUs,
+ but it should only be handling the single RAR that matches the current
+ UE. */
+ LOG_I(NR_MAC, "RAR PDU found for our UE with PDU index %d\n", pdu_id);
+ dl_info->rx_ind->number_pdus = 1;
+ if (pdu_id != 0) {
+ memcpy(&dl_info->rx_ind->rx_indication_body[0],
+ &dl_info->rx_ind->rx_indication_body[pdu_id],
+ sizeof(fapi_nr_rx_indication_body_t));
+ }
+ mac->nr_ue_emul_l1.expected_rar = false;
+ memset(mac->nr_ue_emul_l1.index_has_rar, 0, sizeof(mac->nr_ue_emul_l1.index_has_rar));
+ }
break;
}
if (rarh->E == 0) {
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
index 44bd8f0ce35d5ba01e16771505c004e57aba1021..e1058e1173fe901cf0cd9ad86866ad22ea3e0bca 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
@@ -166,12 +166,14 @@ fapi_nr_ul_config_request_t *get_ul_config_request(NR_UE_MAC_INST_t *mac, int sl
int mu = mac->ULbwp[0] ?
mac->ULbwp[0]->bwp_Common->genericParameters.subcarrierSpacing :
mac->scc_SIB->uplinkConfigCommon->initialUplinkBWP.genericParameters.subcarrierSpacing;
- NR_TDD_UL_DL_Pattern_t *tdd_pattern = &tdd_config->pattern1;
- const int num_slots_per_tdd = nr_slots_per_frame[mu] >> (7 - tdd_pattern->dl_UL_TransmissionPeriodicity);
- const int num_slots_ul = tdd_pattern->nrofUplinkSlots + (tdd_pattern->nrofUplinkSymbols!=0);
+ const int n = nr_slots_per_frame[mu];
+ const int num_slots_per_tdd = tdd_config ? (n >> (7 - tdd_config->pattern1.dl_UL_TransmissionPeriodicity)) : n;
+ const int num_slots_ul = tdd_config ? (tdd_config->pattern1.nrofUplinkSlots + (tdd_config->pattern1.nrofUplinkSymbols != 0)) : n;
int index = slot % num_slots_ul;
- LOG_D(NR_MAC, "In %s slots per tdd %d, num_slots_ul %d, index %d\n", __FUNCTION__,
+ LOG_D(NR_MAC, "In %s slots per %s: %d, num_slots_ul %d, index %d\n",
+ __FUNCTION__,
+ tdd_config ? "TDD" : "FDD",
num_slots_per_tdd,
num_slots_ul,
index);
@@ -632,7 +634,7 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
pusch_config_pdu->nr_of_symbols = NrOfSymbols;
l_prime_mask = get_l_prime(NrOfSymbols, mappingtype, add_pos, dmrslength, StartSymbolIndex, mac->scc ? mac->scc->dmrs_TypeA_Position : mac->mib->dmrs_TypeA_Position);
- LOG_D(MAC, "MSG3 start_sym:%d NR Symb:%d mappingtype:%d , DMRS_MASK:%x\n", pusch_config_pdu->start_symbol_index, pusch_config_pdu->nr_of_symbols, mappingtype, l_prime_mask);
+ LOG_D(NR_MAC, "MSG3 start_sym:%d NR Symb:%d mappingtype:%d, DMRS_MASK:%x\n", pusch_config_pdu->start_symbol_index, pusch_config_pdu->nr_of_symbols, mappingtype, l_prime_mask);
#ifdef DEBUG_MSG3
LOG_D(NR_MAC, "In %s BWP assignment (BWP (start %d, size %d) \n", __FUNCTION__, pusch_config_pdu->bwp_start, pusch_config_pdu->bwp_size);
@@ -766,7 +768,7 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
return -1;
}
/* TIME_DOM_RESOURCE_ASSIGNMENT */
- if (nr_ue_process_dci_time_dom_resource_assignment(mac, pusch_TimeDomainAllocationList, NULL, pusch_config_pdu, NULL, dci->time_domain_assignment.val,0,false) < 0) {
+ if (nr_ue_process_dci_time_dom_resource_assignment(mac, pusch_TimeDomainAllocationList, NULL, pusch_config_pdu, NULL, NULL, dci->time_domain_assignment.val,0,false) < 0) {
return -1;
}
@@ -1044,6 +1046,10 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
nr_dcireq_t dcireq;
if(mac->cg != NULL){ // we have a cg
+
+ nr_schedule_csirs_reception(mac, rx_frame, rx_slot);
+ nr_schedule_csi_for_im(mac, rx_frame, rx_slot);
+
dcireq.module_id = mod_id;
dcireq.gNB_index = gNB_index;
dcireq.cc_id = cc_id;
@@ -1571,7 +1577,7 @@ int nr_ue_pusch_scheduler(NR_UE_MAC_INST_t *mac,
// Calculate TX slot and frame
*slot_tx = (current_slot + k2) % nr_slots_per_frame[mu];
- *frame_tx = ((current_slot + k2) > nr_slots_per_frame[mu]) ? (current_frame + 1) % 1024 : current_frame;
+ *frame_tx = ((current_slot + k2) > (nr_slots_per_frame[mu]-1)) ? (current_frame + 1) % 1024 : current_frame;
}
@@ -2260,8 +2266,7 @@ void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, in
}
// CSI
- if (mac->ra.ra_state == RA_SUCCEEDED ||
- get_softmodem_params()->phy_test == 1)
+ if (mac->ra.ra_state == RA_SUCCEEDED || get_softmodem_params()->phy_test == 1)
O_CSI = nr_get_csi_measurements(mac, frameP, slotP, pucch);
// ACKNACK
@@ -2306,7 +2311,6 @@ void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, in
return;
if (N_UCI > 0) {
-
LOG_D(NR_MAC,"%d.%d configure pucch, O_SR %d, O_ACK %d, O_CSI %d\n",frameP,slotP,O_SR,O_ACK,O_CSI);
pucch->resource_set_id = find_pucch_resource_set(mac, O_ACK + O_CSI);
select_pucch_resource(mac, pucch);
@@ -2330,9 +2334,206 @@ void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, in
if(mac->if_module != NULL && mac->if_module->scheduled_response != NULL)
mac->if_module->scheduled_response(&scheduled_response);
}
+}
+
+
+void nr_schedule_csi_for_im(NR_UE_MAC_INST_t *mac, int frame, int slot) {
+
+ if (mac->ra.ra_state != RA_SUCCEEDED && get_softmodem_params()->phy_test == 0)
+ return;
+ NR_CellGroupConfig_t *CellGroup = mac->cg;
+
+ if (!CellGroup || !CellGroup->spCellConfig || !CellGroup->spCellConfig->spCellConfigDedicated ||
+ !CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig)
+ return;
+
+ NR_CSI_MeasConfig_t *csi_measconfig = CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup;
+
+ if (csi_measconfig->csi_IM_ResourceToAddModList == NULL)
+ return;
+
+ fapi_nr_dl_config_request_t *dl_config = &mac->dl_config_request;
+ NR_CSI_IM_Resource_t *imcsi;
+ int period, offset;
+ NR_BWP_Id_t dl_bwp_id = mac->DL_BWP_Id;
+ int mu = mac->DLbwp[dl_bwp_id-1] ?
+ mac->DLbwp[dl_bwp_id-1]->bwp_Common->genericParameters.subcarrierSpacing :
+ mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP.genericParameters.subcarrierSpacing;
+
+ for (int id = 0; id < csi_measconfig->csi_IM_ResourceToAddModList->list.count; id++){
+ imcsi = csi_measconfig->csi_IM_ResourceToAddModList->list.array[id];
+ csi_period_offset(NULL,imcsi->periodicityAndOffset,&period,&offset);
+ if((frame*nr_slots_per_frame[mu]+slot-offset)%period != 0)
+ continue;
+ fapi_nr_dl_config_csiim_pdu_rel15_t *csiim_config_pdu = &dl_config->dl_config_list[dl_config->number_pdus].csiim_config_pdu.csiim_config_rel15;
+ const NR_BWP_Downlink_t *dlbwp = mac->DLbwp[dl_bwp_id-1];
+ const int locationAndBandwidth = dlbwp != NULL ? dlbwp->bwp_Common->genericParameters.locationAndBandwidth:
+ mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP.genericParameters.locationAndBandwidth;
+ csiim_config_pdu->bwp_size = NRRIV2BW(locationAndBandwidth, MAX_BWP_SIZE);
+ csiim_config_pdu->bwp_start = NRRIV2PRBOFFSET(locationAndBandwidth, MAX_BWP_SIZE);
+ csiim_config_pdu->subcarrier_spacing = mu;
+ csiim_config_pdu->start_rb = imcsi->freqBand->startingRB;
+ csiim_config_pdu->nr_of_rbs = imcsi->freqBand->nrofRBs;
+ // As specified in 5.2.2.4 of 38.214
+ switch (imcsi->csi_IM_ResourceElementPattern->present) {
+ case NR_CSI_IM_Resource__csi_IM_ResourceElementPattern_PR_pattern0:
+ for (int i = 0; i<4; i++) {
+ csiim_config_pdu->k_csiim[i] = (imcsi->csi_IM_ResourceElementPattern->choice.pattern0->subcarrierLocation_p0<<1) + (i>>1);
+ csiim_config_pdu->l_csiim[i] = imcsi->csi_IM_ResourceElementPattern->choice.pattern0->symbolLocation_p0 + (i%2);
+ }
+ break;
+ case NR_CSI_IM_Resource__csi_IM_ResourceElementPattern_PR_pattern1:
+ for (int i = 0; i<4; i++) {
+ csiim_config_pdu->k_csiim[i] = (imcsi->csi_IM_ResourceElementPattern->choice.pattern1->subcarrierLocation_p1<<2) + i;
+ csiim_config_pdu->l_csiim[i] = imcsi->csi_IM_ResourceElementPattern->choice.pattern1->symbolLocation_p1;
+ }
+ break;
+ default:
+ AssertFatal(1==0, "Invalid CSI-IM pattern\n");
+ }
+ dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_CSI_IM;
+ dl_config->number_pdus = dl_config->number_pdus + 1;
+ }
}
+void nr_schedule_csirs_reception(NR_UE_MAC_INST_t *mac, int frame, int slot) {
+
+ if (mac->ra.ra_state != RA_SUCCEEDED && get_softmodem_params()->phy_test == 0)
+ return;
+
+ NR_CellGroupConfig_t *CellGroup = mac->cg;
+
+ if (!CellGroup || !CellGroup->spCellConfig || !CellGroup->spCellConfig->spCellConfigDedicated ||
+ !CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig)
+ return;
+
+ NR_CSI_MeasConfig_t *csi_measconfig = CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup;
+
+ if (csi_measconfig->nzp_CSI_RS_ResourceToAddModList == NULL)
+ return;
+
+ fapi_nr_dl_config_request_t *dl_config = &mac->dl_config_request;
+ NR_NZP_CSI_RS_Resource_t *nzpcsi;
+ int period, offset;
+ NR_BWP_Id_t dl_bwp_id = mac->DL_BWP_Id;
+ int mu = mac->DLbwp[dl_bwp_id-1] ?
+ mac->DLbwp[dl_bwp_id-1]->bwp_Common->genericParameters.subcarrierSpacing :
+ mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP.genericParameters.subcarrierSpacing;
+
+ for (int id = 0; id < csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.count; id++){
+ nzpcsi = csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.array[id];
+ csi_period_offset(NULL,nzpcsi->periodicityAndOffset,&period,&offset);
+ if((frame*nr_slots_per_frame[mu]+slot-offset)%period != 0)
+ continue;
+ LOG_D(MAC,"Scheduling reception of CSI-RS in frame %d slot %d\n",frame,slot);
+ fapi_nr_dl_config_csirs_pdu_rel15_t *csirs_config_pdu = &dl_config->dl_config_list[dl_config->number_pdus].csirs_config_pdu.csirs_config_rel15;
+
+ NR_CSI_RS_ResourceMapping_t resourceMapping = nzpcsi->resourceMapping;
+
+ const NR_BWP_Downlink_t *dlbwp = mac->DLbwp[dl_bwp_id-1];
+ const int locationAndBandwidth = dlbwp != NULL ? dlbwp->bwp_Common->genericParameters.locationAndBandwidth:
+ mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP.genericParameters.locationAndBandwidth;
+ csirs_config_pdu->bwp_size = NRRIV2BW(locationAndBandwidth, MAX_BWP_SIZE);
+ csirs_config_pdu->bwp_start = NRRIV2PRBOFFSET(locationAndBandwidth, MAX_BWP_SIZE);
+ csirs_config_pdu->subcarrier_spacing = mu;
+ csirs_config_pdu->start_rb = resourceMapping.freqBand.startingRB;
+ csirs_config_pdu->nr_of_rbs = resourceMapping.freqBand.nrofRBs;
+ csirs_config_pdu->csi_type = 1; // NZP-CSI-RS
+ csirs_config_pdu->symb_l0 = resourceMapping.firstOFDMSymbolInTimeDomain;
+ if (resourceMapping.firstOFDMSymbolInTimeDomain2)
+ csirs_config_pdu->symb_l1 = *resourceMapping.firstOFDMSymbolInTimeDomain2;
+ csirs_config_pdu->cdm_type = resourceMapping.cdm_Type;
+ csirs_config_pdu->freq_density = resourceMapping.density.present;
+ if ((resourceMapping.density.present == NR_CSI_RS_ResourceMapping__density_PR_dot5)
+ && (resourceMapping.density.choice.dot5 == NR_CSI_RS_ResourceMapping__density__dot5_evenPRBs))
+ csirs_config_pdu->freq_density--;
+ csirs_config_pdu->scramb_id = nzpcsi->scramblingID;
+ switch(resourceMapping.frequencyDomainAllocation.present){
+ case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row1:
+ csirs_config_pdu->row = 1;
+ csirs_config_pdu->freq_domain = ((resourceMapping.frequencyDomainAllocation.choice.row1.buf[0])>>4)&0x0f;
+ break;
+ case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row2:
+ csirs_config_pdu->row = 2;
+ csirs_config_pdu->freq_domain = (((resourceMapping.frequencyDomainAllocation.choice.row2.buf[1]>>4)&0x0f) |
+ ((resourceMapping.frequencyDomainAllocation.choice.row2.buf[0]<<4)&0xff0));
+ break;
+ case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row4:
+ csirs_config_pdu->row = 4;
+ csirs_config_pdu->freq_domain = ((resourceMapping.frequencyDomainAllocation.choice.row4.buf[0])>>5)&0x07;
+ break;
+ case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_other:
+ csirs_config_pdu->freq_domain = ((resourceMapping.frequencyDomainAllocation.choice.other.buf[0])>>2)&0x3f;
+ // determining the row of table 7.4.1.5.3-1 in 38.211
+ switch(resourceMapping.nrofPorts){
+ case NR_CSI_RS_ResourceMapping__nrofPorts_p1:
+ AssertFatal(1==0,"Resource with 1 CSI port shouldn't be within other rows\n");
+ break;
+ case NR_CSI_RS_ResourceMapping__nrofPorts_p2:
+ csirs_config_pdu->row = 3;
+ break;
+ case NR_CSI_RS_ResourceMapping__nrofPorts_p4:
+ csirs_config_pdu->row = 5;
+ break;
+ case NR_CSI_RS_ResourceMapping__nrofPorts_p8:
+ if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
+ csirs_config_pdu->row = 8;
+ else{
+ int num_k = 0;
+ for (int k=0; k<6; k++)
+ num_k+=(((csirs_config_pdu->freq_domain)>>k)&0x01);
+ if(num_k==4)
+ csirs_config_pdu->row = 6;
+ else
+ csirs_config_pdu->row = 7;
+ }
+ break;
+ case NR_CSI_RS_ResourceMapping__nrofPorts_p12:
+ if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
+ csirs_config_pdu->row = 10;
+ else
+ csirs_config_pdu->row = 9;
+ break;
+ case NR_CSI_RS_ResourceMapping__nrofPorts_p16:
+ if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
+ csirs_config_pdu->row = 12;
+ else
+ csirs_config_pdu->row = 11;
+ break;
+ case NR_CSI_RS_ResourceMapping__nrofPorts_p24:
+ if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
+ csirs_config_pdu->row = 14;
+ else{
+ if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm8_FD2_TD4)
+ csirs_config_pdu->row = 15;
+ else
+ csirs_config_pdu->row = 13;
+ }
+ break;
+ case NR_CSI_RS_ResourceMapping__nrofPorts_p32:
+ if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
+ csirs_config_pdu->row = 17;
+ else{
+ if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm8_FD2_TD4)
+ csirs_config_pdu->row = 18;
+ else
+ csirs_config_pdu->row = 16;
+ }
+ break;
+ default:
+ AssertFatal(1==0,"Invalid number of ports in CSI-RS resource\n");
+ }
+ break;
+ default:
+ AssertFatal(1==0,"Invalid freqency domain allocation in CSI-RS resource\n");
+ }
+ dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_CSI_RS;
+ dl_config->number_pdus = dl_config->number_pdus + 1;
+ }
+}
+
+
// This function schedules the PRACH according to prach_ConfigurationIndex and TS 38.211, tables 6.3.3.2.x
// PRACH formats 9, 10, 11 are corresponding to dual PRACH format configurations A1/B1, A2/B2, A3/B3.
// - todo:
diff --git a/openair2/LAYER2/NR_MAC_gNB/config.c b/openair2/LAYER2/NR_MAC_gNB/config.c
index 362338cfc3080e2694ad05315b9459156fc1c2a4..2ac8cf695009db9025aefb5a8426fe6af0aed1af 100644
--- a/openair2/LAYER2/NR_MAC_gNB/config.c
+++ b/openair2/LAYER2/NR_MAC_gNB/config.c
@@ -58,6 +58,7 @@ void process_rlcBearerConfig(struct NR_CellGroupConfig__rlc_BearerToAddModList *
struct NR_CellGroupConfig__rlc_BearerToReleaseList *rlc_bearer2release_list,
NR_UE_sched_ctrl_t *sched_ctrl) {
+
if (rlc_bearer2add_list)
// keep lcids
for (int i=0;i<rlc_bearer2add_list->list.count;i++) {
@@ -135,6 +136,7 @@ void process_CellGroup(NR_CellGroupConfig_t *CellGroup, NR_UE_sched_ctrl_t *sche
process_rlcBearerConfig(CellGroup->rlc_BearerToAddModList,CellGroup->rlc_BearerToReleaseList,sched_ctrl);
}
+
void config_common(int Mod_idP, int ssb_SubcarrierOffset, int pdsch_AntennaPorts, int pusch_AntennaPorts, NR_ServingCellConfigCommon_t *scc) {
nfapi_nr_config_request_scf_t *cfg = &RC.nrmac[Mod_idP]->config[0];
@@ -394,18 +396,17 @@ void config_common(int Mod_idP, int ssb_SubcarrierOffset, int pdsch_AntennaPorts
cfg->num_tlv++;
// TDD Table Configuration
- //cfg->tdd_table.tdd_period.value = scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity;
- cfg->tdd_table.tdd_period.tl.tag = NFAPI_NR_CONFIG_TDD_PERIOD_TAG;
- cfg->num_tlv++;
- if (scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1 == NULL)
- cfg->tdd_table.tdd_period.value = scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity;
- else {
- AssertFatal(scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 != NULL,
- "scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 is null\n");
- cfg->tdd_table.tdd_period.value = *scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530;
- }
- if(cfg->cell_config.frame_duplex_type.value == TDD){
- LOG_I(NR_MAC,"Setting TDD configuration period to %d\n",cfg->tdd_table.tdd_period.value);
+ if (cfg->cell_config.frame_duplex_type.value == TDD){
+ cfg->tdd_table.tdd_period.tl.tag = NFAPI_NR_CONFIG_TDD_PERIOD_TAG;
+ cfg->num_tlv++;
+ if (scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1 == NULL) {
+ cfg->tdd_table.tdd_period.value = scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity;
+ } else {
+ AssertFatal(scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 != NULL,
+ "In %s: scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 is null\n", __FUNCTION__);
+ cfg->tdd_table.tdd_period.value = *scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530;
+ }
+ LOG_I(NR_MAC, "Setting TDD configuration period to %d\n", cfg->tdd_table.tdd_period.value);
int periods_per_frame = set_tdd_config_nr(cfg,
scc->uplinkConfigCommon->frequencyInfoUL->scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSlots,
@@ -423,11 +424,13 @@ void config_common(int Mod_idP, int ssb_SubcarrierOffset, int pdsch_AntennaPorts
}
+
int rrc_mac_config_req_gNB(module_id_t Mod_idP,
int ssb_SubcarrierOffset,
int pdsch_AntennaPorts,
int pusch_AntennaPorts,
int sib1_tda,
+ int minRXTXTIMEpdsch,
NR_ServingCellConfigCommon_t *scc,
NR_BCCH_BCH_Message_t *mib,
int add_ue,
@@ -438,24 +441,21 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
AssertFatal((scc->ssb_PositionsInBurst->present > 0) && (scc->ssb_PositionsInBurst->present < 4), "SSB Bitmap type %d is not valid\n",scc->ssb_PositionsInBurst->present);
/* dimension UL_tti_req_ahead for number of slots in frame */
- const uint8_t slots_per_frame[5] = {10, 20, 40, 80, 160};
- const int n = slots_per_frame[*scc->ssbSubcarrierSpacing];
+ const int n = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
RC.nrmac[Mod_idP]->UL_tti_req_ahead[0] = calloc(n, sizeof(nfapi_nr_ul_tti_request_t));
AssertFatal(RC.nrmac[Mod_idP]->UL_tti_req_ahead[0],
"could not allocate memory for RC.nrmac[]->UL_tti_req_ahead[]\n");
- /* fill in slot/frame numbers: slot is fixed, frame will be updated by
- * scheduler */
+ /* fill in slot/frame numbers: slot is fixed, frame will be updated by scheduler
+ extern sf_ahead is initialized in ru_thread but that function is not executed yet here*/
+ const uint16_t sf_ahead = (uint16_t) ceil((float)6/(0x01<<(*scc->ssbSubcarrierSpacing)));
+ const uint16_t sl_ahead = sf_ahead * (0x01<<(*scc->ssbSubcarrierSpacing));
+ /* consider that scheduler runs sl_ahead: the first sl_ahead slots are
+ * already "in the past" and thus we put frame 1 instead of 0!*/
for (int i = 0; i < n; ++i) {
nfapi_nr_ul_tti_request_t *req = &RC.nrmac[Mod_idP]->UL_tti_req_ahead[0][i];
- /* consider that scheduler runs sl_ahead: the first sl_ahead slots are
- * already "in the past" and thus we put frame 1 instead of 0! Note that
- * variable sl_ahead seems to not be correctly initialized, but I leave
- * it for information purposes here (the fix would always put 0, what
- * happens now, too) */
- req->SFN = i < RC.nrmac[Mod_idP]->if_inst->sl_ahead;
+ req->SFN = i < (RC.nrmac[Mod_idP]->if_inst->sl_ahead-1);
req->Slot = i;
}
-
RC.nrmac[Mod_idP]->common_channels[0].vrb_map_UL =
calloc(n * MAX_BWP_SIZE, sizeof(uint16_t));
AssertFatal(RC.nrmac[Mod_idP]->common_channels[0].vrb_map_UL,
@@ -479,6 +479,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
}
}
RC.nrmac[Mod_idP]->ssb_SubcarrierOffset = ssb_SubcarrierOffset;
+ RC.nrmac[Mod_idP]->minRXTXTIMEpdsch = minRXTXTIMEpdsch;
NR_PHY_Config_t phycfg;
phycfg.Mod_id = Mod_idP;
@@ -489,17 +490,28 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
find_SSB_and_RO_available(Mod_idP);
- const NR_TDD_UL_DL_Pattern_t *tdd = &scc->tdd_UL_DL_ConfigurationCommon->pattern1;
- const int nr_mix_slots = tdd->nrofDownlinkSymbols != 0 || tdd->nrofUplinkSymbols != 0;
- const int nr_slots_period = tdd->nrofDownlinkSlots + tdd->nrofUplinkSlots + nr_mix_slots;
- const int nr_dlmix_slots = tdd->nrofDownlinkSlots + (tdd->nrofDownlinkSymbols != 0);
- const int nr_ulstart_slot = tdd->nrofDownlinkSlots + (tdd->nrofUplinkSymbols == 0);
+ const NR_TDD_UL_DL_Pattern_t *tdd = scc->tdd_UL_DL_ConfigurationCommon ? &scc->tdd_UL_DL_ConfigurationCommon->pattern1 : NULL;
+
+ int nr_slots_period = n;
+ int nr_dl_slots = n;
+ int nr_ulstart_slot = 0;
+ if (tdd) {
+ nr_dl_slots = tdd->nrofDownlinkSlots + (tdd->nrofDownlinkSymbols != 0);
+ nr_ulstart_slot = tdd->nrofDownlinkSlots + (tdd->nrofUplinkSymbols == 0);
+ nr_slots_period /= get_nb_periods_per_frame(tdd->dl_UL_TransmissionPeriodicity);
+ }
+ else
+ // if TDD configuration is not present and the band is not FDD, it means it is a dynamic TDD configuration
+ AssertFatal(RC.nrmac[Mod_idP]->common_channels[0].frame_type == FDD,"Dynamic TDD not handled yet\n");
for (int slot = 0; slot < n; ++slot) {
- if (slot != 0)
- RC.nrmac[Mod_idP]->dlsch_slot_bitmap[slot / 64] |= (uint64_t)((slot % nr_slots_period) < nr_dlmix_slots) << (slot % 64);
+ if (RC.nrmac[Mod_idP]->common_channels[0].frame_type == FDD ||
+ (slot != 0))
+ RC.nrmac[Mod_idP]->dlsch_slot_bitmap[slot / 64] |= (uint64_t)((slot % nr_slots_period) < nr_dl_slots) << (slot % 64);
RC.nrmac[Mod_idP]->ulsch_slot_bitmap[slot / 64] |= (uint64_t)((slot % nr_slots_period) >= nr_ulstart_slot) << (slot % 64);
- LOG_D(NR_MAC, "slot %d DL %d UL %d\n",
+
+ LOG_I(NR_MAC, "In %s: slot %d DL %d UL %d\n",
+ __FUNCTION__,
slot,
(RC.nrmac[Mod_idP]->dlsch_slot_bitmap[slot / 64] & ((uint64_t)1 << (slot % 64))) != 0,
(RC.nrmac[Mod_idP]->ulsch_slot_bitmap[slot / 64] & ((uint64_t)1 << (slot % 64))) != 0);
@@ -612,16 +624,10 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
const NR_ServingCellConfig_t *servingCellConfig = CellGroup ? CellGroup->spCellConfig->spCellConfigDedicated : NULL;
NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
const NR_PDSCH_ServingCellConfig_t *pdsch = servingCellConfig ? servingCellConfig->pdsch_ServingCellConfig->choice.setup : NULL;
- if (sched_ctrl->available_dl_harq.len == 0) {
+ if (get_softmodem_params()->sa) {
// add all available DL HARQ processes for this UE in SA
create_dl_harq_list(sched_ctrl, pdsch);
}
- else {
- const int nrofHARQ = pdsch && pdsch->nrofHARQ_ProcessesForPDSCH ?
- get_nrofHARQ_ProcessesForPDSCH(*pdsch->nrofHARQ_ProcessesForPDSCH) : 8;
- AssertFatal(sched_ctrl->available_dl_harq.len==nrofHARQ,
- "Reconfiguration of available harq processes not yet supported\n");
- }
// update coreset/searchspace
void *bwpd = NULL;
NR_BWP_t *genericParameters = NULL;
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
index ba854608c53613889398c9d6fae85cc0f5070127..51541353f41377faeb9fa135428ce32f67443dca 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
@@ -36,6 +36,7 @@
#include "NR_MAC_gNB/mac_proto.h"
#include "common/utils/LOG/log.h"
+#include "common/utils/nr/nr_common.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
#include "UTIL/OPT/opt.h"
#include "OCG.h"
@@ -89,7 +90,7 @@ void clear_nr_nfapi_information(gNB_MAC_INST * gNB,
/* advance last round's future UL_tti_req to be ahead of current frame/slot */
future_ul_tti_req->SFN = (slotP == 0 ? frameP : frameP + 1) % 1024;
- LOG_D(MAC,"Future_ul_tti SFN = %d for slot %d \n", future_ul_tti_req->SFN, (slotP + num_slots - 1) % num_slots);
+ LOG_D(NR_MAC, "In %s: UL_tti_req_ahead SFN.slot = %d.%d for slot %d \n", __FUNCTION__, future_ul_tti_req->SFN, future_ul_tti_req->Slot, (slotP + num_slots - 1) % num_slots);
/* future_ul_tti_req->Slot is fixed! */
future_ul_tti_req->n_pdus = 0;
future_ul_tti_req->n_ulsch = 0;
@@ -284,12 +285,11 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
NR_ServingCellConfigCommon_t *scc = cc->ServingCellConfigCommon;
if (slot==0 && (*scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0]>=257)) {
+ //FR2
const NR_TDD_UL_DL_Pattern_t *tdd = &scc->tdd_UL_DL_ConfigurationCommon->pattern1;
- const int n = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
- const int nr_mix_slots = tdd->nrofDownlinkSymbols != 0 || tdd->nrofUplinkSymbols != 0;
- const int nr_slots_period = tdd->nrofDownlinkSlots + tdd->nrofUplinkSlots + nr_mix_slots;
- const int nb_periods_per_frame = n / nr_slots_period;
- // re-initialization of tdd_beam_association at beginning of frame (only for FR2)
+ AssertFatal(tdd,"Dynamic TDD not handled yet\n");
+ const int nb_periods_per_frame = get_nb_periods_per_frame(tdd->dl_UL_TransmissionPeriodicity);
+ // re-initialization of tdd_beam_association at beginning of frame
for (int i=0; i<nb_periods_per_frame; i++)
gNB->tdd_beam_association[i] = -1;
}
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index c5ec5e04e8c291761883ab4c0c0e5aace002c807..fe0ba251cb5445a62bd6910b96b952e4d09b2e49 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -397,6 +397,7 @@ void schedule_nr_prach(module_id_t module_idP, frame_t frameP, sub_frame_t slotP
void nr_schedule_msg2(uint16_t rach_frame, uint16_t rach_slot,
uint16_t *msg2_frame, uint16_t *msg2_slot,
NR_ServingCellConfigCommon_t *scc,
+ lte_frame_type_t frame_type,
uint16_t monitoring_slot_period,
uint16_t monitoring_offset,uint8_t beam_index,
uint8_t num_active_ssb,
@@ -404,18 +405,25 @@ void nr_schedule_msg2(uint16_t rach_frame, uint16_t rach_slot,
// preferentially we schedule the msg2 in the mixed slot or in the last dl slot
// if they are allowed by search space configuration
-
uint8_t mu = *scc->ssbSubcarrierSpacing;
uint8_t response_window = scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->rach_ConfigGeneric.ra_ResponseWindow;
uint8_t slot_window;
+ const int n_slots_frame = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
+ const NR_TDD_UL_DL_Pattern_t *tdd = scc->tdd_UL_DL_ConfigurationCommon ? &scc->tdd_UL_DL_ConfigurationCommon->pattern1 : NULL;
// number of mixed slot or of last dl slot if there is no mixed slot
- uint8_t last_dl_slot_period = scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSlots;
+ uint8_t last_dl_slot_period = n_slots_frame-1;
// lenght of tdd period in slots
- uint8_t tdd_period_slot = scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSlots + scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
- if (scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSymbols == 0)
- last_dl_slot_period--;
- if ((scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSymbols > 0) || (scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols > 0))
- tdd_period_slot++;
+ uint8_t tdd_period_slot = n_slots_frame;
+
+ if (tdd) {
+ last_dl_slot_period = tdd->nrofDownlinkSymbols == 0? (tdd->nrofDownlinkSlots-1) : tdd->nrofDownlinkSlots;
+ tdd_period_slot = n_slots_frame/get_nb_periods_per_frame(tdd->dl_UL_TransmissionPeriodicity);
+ }
+ else{
+ if(frame_type == TDD)
+ AssertFatal(frame_type == FDD, "Dynamic TDD not handled yet\n");
+ }
+
switch(response_window){
case NR_RACH_ConfigGeneric__ra_ResponseWindow_sl1:
@@ -449,7 +457,7 @@ void nr_schedule_msg2(uint16_t rach_frame, uint16_t rach_slot,
// slot and frame limit to transmit msg2 according to response window
uint8_t slot_limit = (rach_slot + slot_window)%nr_slots_per_frame[mu];
- uint8_t frame_limit = (slot_limit>(rach_slot))? rach_frame : (rach_frame +1);
+ uint16_t frame_limit = (slot_limit>(rach_slot))? rach_frame : (rach_frame +1);
// computing start of next period
@@ -478,9 +486,21 @@ void nr_schedule_msg2(uint16_t rach_frame, uint16_t rach_slot,
// go to previous slot if the current scheduled slot is beyond the response window
// and if the slot is not among the PDCCH monitored ones (38.213 10.1)
- while (((*msg2_slot>slot_limit)&&(*msg2_frame>frame_limit)) || ((*msg2_frame*nr_slots_per_frame[mu]+*msg2_slot-monitoring_offset)%monitoring_slot_period !=0)) {
- if((*msg2_slot%tdd_period_slot) > 0)
- (*msg2_slot)--;
+ while (*msg2_frame > frame_limit
+ || (*msg2_frame == frame_limit && *msg2_slot > slot_limit)
+ || ((*msg2_frame * nr_slots_per_frame[mu] + *msg2_slot - monitoring_offset) % monitoring_slot_period != 0)) {
+
+ if((frame_type == FDD) || ((*msg2_slot%tdd_period_slot) > 0)) {
+ if (*msg2_slot==0) {
+ if(*msg2_frame != 0)
+ (*msg2_frame)--;
+ else
+ *msg2_frame = 1023;
+ *msg2_slot = nr_slots_per_frame[mu] - 1;
+ }
+ else
+ (*msg2_slot)--;
+ }
else
AssertFatal(1==0,"No available DL slot to schedule msg2 has been found");
}
@@ -503,6 +523,7 @@ void nr_initiate_ra_proc(module_id_t module_idP,
gNB_MAC_INST *nr_mac = RC.nrmac[module_idP];
NR_COMMON_channels_t *cc = &nr_mac->common_channels[CC_id];
NR_ServingCellConfigCommon_t *scc = cc->ServingCellConfigCommon;
+ lte_frame_type_t frame_type = cc->frame_type;
uint8_t total_RApreambles = MAX_NUM_NR_PRACH_PREAMBLES;
uint8_t num_ssb_per_RO = scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB->present;
@@ -624,6 +645,7 @@ void nr_initiate_ra_proc(module_id_t module_idP,
&msg2_frame,
&msg2_slot,
scc,
+ frame_type,
monitoring_slot_period,
monitoring_offset,
beam_index,
@@ -735,10 +757,13 @@ void nr_generate_Msg3_retransmission(module_id_t module_idP, int CC_id, frame_t
// beam association for FR2
int16_t *tdd_beam_association = nr_mac->tdd_beam_association;
if (*scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0] >= 257) {
- uint8_t tdd_period_slot = scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSlots + scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
- if ((scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSymbols > 0) || (scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols > 0))
- tdd_period_slot++;
+ // FR2
+ const int n_slots_frame = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
+ const NR_TDD_UL_DL_Pattern_t *tdd = scc->tdd_UL_DL_ConfigurationCommon ? &scc->tdd_UL_DL_ConfigurationCommon->pattern1 : NULL;
+ AssertFatal(tdd,"Dynamic TDD not handled yet\n");
+ uint8_t tdd_period_slot = n_slots_frame/get_nb_periods_per_frame(tdd->dl_UL_TransmissionPeriodicity);
int num_tdd_period = sched_slot/tdd_period_slot;
+
if((tdd_beam_association[num_tdd_period]!=-1)&&(tdd_beam_association[num_tdd_period]!=ra->beam_id))
return; // can't schedule retransmission in this slot
else
@@ -899,6 +924,8 @@ void nr_get_Msg3alloc(module_id_t module_id,
uint16_t msg3_nb_rb = 8; // sdu has 6 or 8 bytes
+ lte_frame_type_t frame_type = RC.nrmac[module_id]->common_channels->frame_type;
+
int mu = ubwp ?
ubwp->bwp_Common->genericParameters.subcarrierSpacing :
scc->uplinkConfigCommon->initialUplinkBWP->genericParameters.subcarrierSpacing;
@@ -909,8 +936,9 @@ void nr_get_Msg3alloc(module_id_t module_id,
ubwp->bwp_Common->pusch_ConfigCommon->choice.setup->pusch_TimeDomainAllocationList:
scc->uplinkConfigCommon->initialUplinkBWP->pusch_ConfigCommon->choice.setup->pusch_TimeDomainAllocationList;
+ const NR_TDD_UL_DL_Pattern_t *tdd = scc->tdd_UL_DL_ConfigurationCommon ? &scc->tdd_UL_DL_ConfigurationCommon->pattern1 : NULL;
+ const int n_slots_frame = nr_slots_per_frame[mu];
uint8_t k2 = 0;
- lte_frame_type_t frame_type = get_frame_type(*scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0], *scc->ssbSubcarrierSpacing);
if (frame_type == TDD) {
int nb_periods_per_frame = get_nb_periods_per_frame(scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity);
int nb_slots_per_period = ((1<<mu)*10)/nb_periods_per_frame;
@@ -943,16 +971,15 @@ void nr_get_Msg3alloc(module_id_t module_id,
AssertFatal(ra->Msg3_tda_id<16,"Unable to find Msg3 time domain allocation in list\n");
- if (nr_slots_per_frame[mu]>temp_slot)
+ if (n_slots_frame > temp_slot)
ra->Msg3_frame = current_frame;
else
- ra->Msg3_frame = (current_frame + (temp_slot/nr_slots_per_frame[mu]))%1024;
+ ra->Msg3_frame = (current_frame + (temp_slot / n_slots_frame)) % 1024;
// beam association for FR2
if (*scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0] >= 257) {
- uint8_t tdd_period_slot = scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSlots + scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
- if ((scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSymbols > 0) || (scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols > 0))
- tdd_period_slot++;
+ AssertFatal(tdd,"Dynamic TDD not handled yet\n");
+ uint8_t tdd_period_slot = n_slots_frame/get_nb_periods_per_frame(tdd->dl_UL_TransmissionPeriodicity);
int num_tdd_period = ra->Msg3_slot/tdd_period_slot;
if((tdd_beam_association[num_tdd_period]!=-1)&&(tdd_beam_association[num_tdd_period]!=ra->beam_id))
AssertFatal(1==0,"Cannot schedule MSG3\n");
@@ -1008,7 +1035,9 @@ void fill_msg3_pusch_pdu(nfapi_nr_pusch_pdu_t *pusch_pdu,
int start_symbol_index,nr_of_symbols;
+
SLIV2SL(startSymbolAndLength, &start_symbol_index, &nr_of_symbols);
+ int mcsindex = -1; // init value
pusch_pdu->pdu_bit_map = PUSCH_PDU_BITMAP_PUSCH_DATA;
pusch_pdu->rnti = rnti;
@@ -1017,10 +1046,7 @@ void fill_msg3_pusch_pdu(nfapi_nr_pusch_pdu_t *pusch_pdu,
pusch_pdu->bwp_size = bwp_size;
pusch_pdu->subcarrier_spacing = scs;
pusch_pdu->cyclic_prefix = 0;
- pusch_pdu->mcs_index = 1;
pusch_pdu->mcs_table = 0;
- pusch_pdu->target_code_rate = nr_get_code_rate_ul(pusch_pdu->mcs_index,pusch_pdu->mcs_table);
- pusch_pdu->qam_mod_order = nr_get_Qm_ul(pusch_pdu->mcs_index,pusch_pdu->mcs_table);
if (scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->msg3_transformPrecoder == NULL)
pusch_pdu->transform_precoding = 1;
else
@@ -1028,14 +1054,13 @@ void fill_msg3_pusch_pdu(nfapi_nr_pusch_pdu_t *pusch_pdu,
pusch_pdu->data_scrambling_id = *scc->physCellId;
pusch_pdu->nrOfLayers = 1;
pusch_pdu->ul_dmrs_symb_pos = get_l_prime(nr_of_symbols,mappingtype,pusch_dmrs_pos2,pusch_len1,start_symbol_index, scc->dmrs_TypeA_Position);
- LOG_I(MAC, "MSG3 mcs %d, nb_rb %d, first_rb %d, start_sym:%d NR Symb:%d mappingtype:%d , ul_dmrs_symb_pos:%x\n", pusch_pdu->mcs_index,msg3_nb_rb,msg3_first_rb, start_symbol_index, nr_of_symbols, mappingtype, pusch_pdu->ul_dmrs_symb_pos);
+ LOG_D(NR_MAC, "MSG3 start_sym:%d NR Symb:%d mappingtype:%d, ul_dmrs_symb_pos:%x\n", start_symbol_index, nr_of_symbols, mappingtype, pusch_pdu->ul_dmrs_symb_pos);
pusch_pdu->dmrs_config_type = 0;
pusch_pdu->ul_dmrs_scrambling_id = *scc->physCellId; //If provided and the PUSCH is not a msg3 PUSCH, otherwise, L2 should set this to physical cell id.
pusch_pdu->scid = 0; //DMRS sequence initialization [TS38.211, sec 6.4.1.1.1]. Should match what is sent in DCI 0_1, otherwise set to 0.
pusch_pdu->dmrs_ports = 1; // 6.2.2 in 38.214 only port 0 to be used
pusch_pdu->num_dmrs_cdm_grps_no_data = 2; // no data in dmrs symbols as in 6.2.2 in 38.214
pusch_pdu->resource_alloc = 1; //type 1
-
pusch_pdu->rb_start = msg3_first_rb;
if (msg3_nb_rb > pusch_pdu->bwp_size)
AssertFatal(1==0,"MSG3 allocated number of RBs exceed the BWP size\n");
@@ -1057,15 +1082,24 @@ void fill_msg3_pusch_pdu(nfapi_nr_pusch_pdu_t *pusch_pdu,
int num_dmrs_symb = 0;
for(int i = start_symbol_index; i < start_symbol_index+nr_of_symbols; i++)
num_dmrs_symb += (pusch_pdu->ul_dmrs_symb_pos >> i) & 1;
- pusch_pdu->pusch_data.tb_size = nr_compute_tbs(pusch_pdu->qam_mod_order,
- pusch_pdu->target_code_rate,
- pusch_pdu->rb_size,
- pusch_pdu->nr_of_symbols,
- num_dmrs_symb*12, // nb dmrs set for no data in dmrs symbol
- 0, //nb_rb_oh
- 0, // to verify tb scaling
- pusch_pdu->nrOfLayers)>>3;
+ int TBS = 0;
+ while(TBS<7) { // TBS for msg3 is 7 bytes (except for RRCResumeRequest1 currently not implemented)
+ mcsindex++;
+ pusch_pdu->target_code_rate = nr_get_code_rate_ul(mcsindex,pusch_pdu->mcs_table);
+ pusch_pdu->qam_mod_order = nr_get_Qm_ul(mcsindex,pusch_pdu->mcs_table);
+ TBS = nr_compute_tbs(pusch_pdu->qam_mod_order,
+ pusch_pdu->target_code_rate,
+ pusch_pdu->rb_size,
+ pusch_pdu->nr_of_symbols,
+ num_dmrs_symb*12, // nb dmrs set for no data in dmrs symbol
+ 0, //nb_rb_oh
+ 0, // to verify tb scaling
+ pusch_pdu->nrOfLayers)>>3;
+
+ pusch_pdu->mcs_index = mcsindex;
+ pusch_pdu->pusch_data.tb_size = TBS;
+ }
}
void nr_add_msg3(module_id_t module_idP, int CC_id, frame_t frameP, sub_frame_t slotP, NR_RA_t *ra, uint8_t *RAR_pdu)
@@ -1159,7 +1193,7 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
time_domain_assignment = 1;
else
time_domain_assignment = 0;
- uint8_t mcsIndex = 0;
+ int mcsIndex = -1; // initialization value
int rbStart = 0;
int rbSize = 8;
@@ -1316,9 +1350,6 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
pdsch_pdu_rel15->SubcarrierSpacing = genericParameters->subcarrierSpacing;
pdsch_pdu_rel15->CyclicPrefix = 0;
pdsch_pdu_rel15->NrOfCodewords = 1;
- pdsch_pdu_rel15->targetCodeRate[0] = nr_get_code_rate_dl(mcsIndex,mcsTableIdx);
- pdsch_pdu_rel15->qamModOrder[0] = 2;
- pdsch_pdu_rel15->mcsIndex[0] = mcsIndex;
pdsch_pdu_rel15->mcsTable[0] = mcsTableIdx;
pdsch_pdu_rel15->rvIndex[0] = 0;
pdsch_pdu_rel15->dataScramblingId = *scc->physCellId;
@@ -1342,9 +1373,38 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
startSymbolIndex,
mappingtype, 1);
- int x_Overhead = 0;
uint8_t tb_scaling = 0;
- nr_get_tbs_dl(&dl_tti_pdsch_pdu->pdsch_pdu, x_Overhead, pdsch_pdu_rel15->numDmrsCdmGrpsNoData, tb_scaling);
+ int R, Qm;
+ uint8_t N_PRB_DMRS;
+ uint32_t TBS=0;
+ if (dmrsConfigType == NFAPI_NR_DMRS_TYPE1) {
+ // if no data in dmrs cdm group is 1 only even REs have no data
+ // if no data in dmrs cdm group is 2 both odd and even REs have no data
+ N_PRB_DMRS = pdsch_pdu_rel15->numDmrsCdmGrpsNoData*6;
+ }
+ else {
+ N_PRB_DMRS = pdsch_pdu_rel15->numDmrsCdmGrpsNoData*4;
+ }
+ uint16_t dmrs_length = get_num_dmrs(pdsch_pdu_rel15->dlDmrsSymbPos);
+
+ while(TBS<9) { // min TBS for RAR is 9 bytes
+ mcsIndex++;
+ R = nr_get_code_rate_dl(mcsIndex, mcsTableIdx);
+ Qm = nr_get_Qm_dl(mcsIndex, mcsTableIdx);
+ TBS = nr_compute_tbs(Qm,
+ R,
+ rbSize,
+ nrOfSymbols,
+ N_PRB_DMRS*dmrs_length,
+ 0, // overhead
+ tb_scaling, // tb scaling
+ 1)>>3; // layers
+
+ pdsch_pdu_rel15->targetCodeRate[0] = R;
+ pdsch_pdu_rel15->qamModOrder[0] = Qm;
+ pdsch_pdu_rel15->mcsIndex[0] = mcsIndex;
+ pdsch_pdu_rel15->TBSize[0] = TBS;
+ }
// Fill PDCCH DL DCI PDU
nfapi_nr_dl_dci_pdu_t *dci_pdu = &pdcch_pdu_rel15->dci_pdu[pdcch_pdu_rel15->numDlDci];
@@ -1633,21 +1693,16 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
uint16_t *vrb_map = cc[CC_id].vrb_map;
// increase PRBs until we get to BWPSize or TBS is bigger than MAC PDU size
do {
- rbSize++;
- LOG_D(NR_MAC,"Msg4 Allocation : RBloop Calling nr_compute_tbs with N_PRB_DMRS %d, N_DMRS_SLOT %d\n",N_PRB_DMRS,N_DMRS_SLOT);
- harq->tb_size = nr_compute_tbs(nr_get_Qm_dl(mcsIndex, mcsTableIdx),
- nr_get_code_rate_dl(mcsIndex, mcsTableIdx),
- rbSize, nrOfSymbols, N_PRB_DMRS * N_DMRS_SLOT, 0, tb_scaling,1) >> 3;
- } while (rbSize < BWPSize && harq->tb_size < ra->mac_pdu_length);
- // increase mcs until we get a TBS that is big enough to fix the MAC PDU
- do {
- mcsIndex++;
- LOG_D(NR_MAC,"Msg4 Allocation: MCSloop Calling nr_compute_tbs with N_PRB_DMRS %d, N_DMRS_SLOT %d\n",N_PRB_DMRS,N_DMRS_SLOT);
+ if(rbSize < BWPSize)
+ rbSize++;
+ else
+ mcsIndex++;
+ LOG_D(NR_MAC,"Calling nr_compute_tbs with N_PRB_DMRS %d, N_DMRS_SLOT %d\n",N_PRB_DMRS,N_DMRS_SLOT);
harq->tb_size = nr_compute_tbs(nr_get_Qm_dl(mcsIndex, mcsTableIdx),
- nr_get_code_rate_dl(mcsIndex, mcsTableIdx),
- rbSize, nrOfSymbols, N_PRB_DMRS * N_DMRS_SLOT, 0, tb_scaling,1) >> 3;
- } while (harq->tb_size < ra->mac_pdu_length && mcsIndex<10);
- AssertFatal(mcsIndex<10,"Cannot fit Msg4 in %d PRBs with QPSK\n",(int)BWPSize);
+ nr_get_code_rate_dl(mcsIndex, mcsTableIdx),
+ rbSize, nrOfSymbols, N_PRB_DMRS * N_DMRS_SLOT, 0, tb_scaling,1) >> 3;
+ } while (harq->tb_size < ra->mac_pdu_length && mcsIndex<=28);
+
int i = 0;
while ((i < rbSize) && (rbStart + rbSize <= BWPSize)) {
if (vrb_map[BWPStart + rbStart + i]&SL_to_bitmap(startSymbolIndex, nrOfSymbols)) {
@@ -2024,25 +2079,16 @@ void nr_fill_rar(uint8_t Mod_idP,
rar->UL_GRANT_4 = (uint8_t) ul_grant & 0xff;
#ifdef DEBUG_RAR
- //LOG_I(NR_MAC, "rarbi->E = 0x%x\n", rarbi->E);
- //LOG_I(NR_MAC, "rarbi->T = 0x%x\n", rarbi->T);
- //LOG_I(NR_MAC, "rarbi->R = 0x%x\n", rarbi->R);
- //LOG_I(NR_MAC, "rarbi->BI = 0x%x\n", rarbi->BI);
-
LOG_I(NR_MAC, "rarh->E = 0x%x\n", rarh->E);
LOG_I(NR_MAC, "rarh->T = 0x%x\n", rarh->T);
LOG_I(NR_MAC, "rarh->RAPID = 0x%x (%i)\n", rarh->RAPID, rarh->RAPID);
-
LOG_I(NR_MAC, "rar->R = 0x%x\n", rar->R);
LOG_I(NR_MAC, "rar->TA1 = 0x%x\n", rar->TA1);
-
LOG_I(NR_MAC, "rar->TA2 = 0x%x\n", rar->TA2);
LOG_I(NR_MAC, "rar->UL_GRANT_1 = 0x%x\n", rar->UL_GRANT_1);
-
LOG_I(NR_MAC, "rar->UL_GRANT_2 = 0x%x\n", rar->UL_GRANT_2);
LOG_I(NR_MAC, "rar->UL_GRANT_3 = 0x%x\n", rar->UL_GRANT_3);
LOG_I(NR_MAC, "rar->UL_GRANT_4 = 0x%x\n", rar->UL_GRANT_4);
-
LOG_I(NR_MAC, "rar->TCRNTI_1 = 0x%x\n", rar->TCRNTI_1);
LOG_I(NR_MAC, "rar->TCRNTI_2 = 0x%x\n", rar->TCRNTI_2);
#endif
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
index 4d864ebe9c6037697030e3da900b20648e3e4813..6614617b0e5e72694694175181afb1ae1763a7eb 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
@@ -267,8 +267,9 @@ void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
schedule_ssb(frameP, slotP, scc, dl_req, i_ssb, ssbSubcarrierOffset, offset_pointa, (*(uint32_t*)cc->MIB_pdu.payload) & ((1<<24)-1));
fill_ssb_vrb_map(cc, offset_pointa, ssb_start_symbol, CC_id);
const NR_TDD_UL_DL_Pattern_t *tdd = &scc->tdd_UL_DL_ConfigurationCommon->pattern1;
- const int nr_mix_slots = tdd->nrofDownlinkSymbols != 0 || tdd->nrofUplinkSymbols != 0;
- const int nr_slots_period = tdd->nrofDownlinkSlots + tdd->nrofUplinkSlots + nr_mix_slots;
+ const int n_slots_frame = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
+ // FR2 is only TDD, to be fixed for flexible TDD
+ const int nr_slots_period = tdd ? n_slots_frame/get_nb_periods_per_frame(scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity) : n_slots_frame;
num_tdd_period = rel_slot/nr_slots_period;
gNB->tdd_beam_association[num_tdd_period]=i_ssb;
num_ssb++;
@@ -613,14 +614,15 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
int startSymbolIndex = 0;
int nrOfSymbols = 0;
+ bool is_typeA;
get_info_from_tda_tables(type0_PDCCH_CSS_config->type0_pdcch_ss_mux_pattern,
time_domain_allocation,
gNB_mac->common_channels->ServingCellConfigCommon->dmrs_TypeA_Position,
- 1, &startSymbolIndex, &nrOfSymbols);
+ 1, &is_typeA,
+ &startSymbolIndex, &nrOfSymbols);
- // TODO: There are exceptions to this in table 5.1.2.1.1-4,5 (Default time domain allocation tables B, C)
- int mappingtype = (startSymbolIndex <= 3)? typeA: typeB;
+ int mappingtype = is_typeA? typeA: typeB;
uint16_t dlDmrsSymbPos = fill_dmrs_mask(NULL, gNB_mac->common_channels->ServingCellConfigCommon->dmrs_TypeA_Position, nrOfSymbols, startSymbolIndex, mappingtype, 1);
// Configure sched_ctrlCommon for SIB1
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
index 4c902e2675f62d6468a20353873cda42eb0dd07b..940bca8caf1f8587e85395a1cd42c3f6a81b959b 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
@@ -62,9 +62,22 @@ void calculate_preferred_dl_tda(module_id_t module_id, const NR_BWP_Downlink_t *
/* there is a mixed slot only when in TDD */
NR_ServingCellConfigCommon_t *scc = nrmac->common_channels->ServingCellConfigCommon;
+ lte_frame_type_t frame_type = nrmac->common_channels->frame_type;
+ const int n = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
const NR_TDD_UL_DL_Pattern_t *tdd =
scc->tdd_UL_DL_ConfigurationCommon ? &scc->tdd_UL_DL_ConfigurationCommon->pattern1 : NULL;
- const int symb_dlMixed = tdd ? (1 << tdd->nrofDownlinkSymbols) - 1 : 0;
+
+ int symb_dlMixed = 0;
+ int nr_mix_slots = 0;
+ int nr_slots_period = n;
+ if (tdd) {
+ symb_dlMixed = (1 << tdd->nrofDownlinkSymbols) - 1;
+ nr_mix_slots = tdd->nrofDownlinkSymbols != 0 || tdd->nrofUplinkSymbols != 0;
+ nr_slots_period /= get_nb_periods_per_frame(tdd->dl_UL_TransmissionPeriodicity);
+ }
+ else
+ // if TDD configuration is not present and the band is not FDD, it means it is a dynamic TDD configuration
+ AssertFatal(nrmac->common_channels->frame_type == FDD,"Dynamic TDD not handled yet\n");
int target_ss;
if (bwp) {
@@ -97,7 +110,7 @@ void calculate_preferred_dl_tda(module_id_t module_id, const NR_BWP_Downlink_t *
/* check that TDA index 1 fits into DL part of mixed slot, if it exists */
int tdaMi = -1;
- if (tdaList->list.count > 1) {
+ if (frame_type == TDD && tdaList->list.count > 1) {
const NR_PDSCH_TimeDomainResourceAllocation_t *tdaP_Mi = tdaList->list.array[1];
AssertFatal(!tdaP_Mi->k0 || *tdaP_Mi->k0 == 0,
"TimeDomainAllocation at index 1: non-null k0 (%ld) is not supported by the scheduler\n",
@@ -120,17 +133,13 @@ void calculate_preferred_dl_tda(module_id_t module_id, const NR_BWP_Downlink_t *
}
}
- const uint8_t slots_per_frame[5] = {10, 20, 40, 80, 160};
- const int n = slots_per_frame[*scc->ssbSubcarrierSpacing];
nrmac->preferred_dl_tda[bwp_id] = malloc(n * sizeof(*nrmac->preferred_dl_tda[bwp_id]));
- const int nr_mix_slots = tdd ? tdd->nrofDownlinkSymbols != 0 || tdd->nrofUplinkSymbols != 0 : 0;
- const int nr_slots_period = tdd ? tdd->nrofDownlinkSlots + tdd->nrofUplinkSlots + nr_mix_slots : n;
for (int i = 0; i < n; ++i) {
nrmac->preferred_dl_tda[bwp_id][i] = -1;
- if (!tdd || i % nr_slots_period < tdd->nrofDownlinkSlots)
+ if (frame_type == FDD || i % nr_slots_period < tdd->nrofDownlinkSlots)
nrmac->preferred_dl_tda[bwp_id][i] = 0;
- else if (tdd && nr_mix_slots && i % nr_slots_period == tdd->nrofDownlinkSlots)
+ else if (nr_mix_slots && i % nr_slots_period == tdd->nrofDownlinkSlots)
nrmac->preferred_dl_tda[bwp_id][i] = tdaMi;
LOG_D(MAC, "slot %d preferred_dl_tda %d\n", i, nrmac->preferred_dl_tda[bwp_id][i]);
}
@@ -590,6 +599,7 @@ bool allocate_dl_retransmission(module_id_t module_id,
while (rbStart + rbSize < bwpSize &&
(rballoc_mask[rbStart + rbSize]&SL_to_bitmap(temp_ps.startSymbolIndex, temp_ps.nrOfSymbols)))
rbSize++;
+
uint32_t new_tbs;
uint16_t new_rbSize;
bool success = nr_find_nb_rb(retInfo->Qm,
@@ -598,6 +608,7 @@ bool allocate_dl_retransmission(module_id_t module_id,
temp_ps.nrOfSymbols,
temp_ps.N_PRB_DMRS * temp_ps.N_DMRS_SLOT,
retInfo->tb_size,
+ 1, /* minimum of 1RB: need to find exact TBS, don't preclude any number */
rbSize,
&new_tbs,
&new_rbSize);
@@ -752,8 +763,9 @@ void pf_dl(module_id_t module_id,
}
}
+ const int min_rbSize = 5;
/* Loop UE_sched to find max coeff and allocate transmission */
- while (max_num_ue > 0 && n_rb_sched > 0 && UE_sched.head >= 0) {
+ while (max_num_ue > 0 && n_rb_sched >= min_rbSize && UE_sched.head >= 0) {
/* Find max coeff from UE_sched*/
int *max = &UE_sched.head; /* assume head is max */
@@ -813,9 +825,6 @@ void pf_dl(module_id_t module_id,
LOG_D(NR_MAC, "%4d.%2d could not find CCE for DL DCI UE %d/RNTI %04x\n", frame, slot, UE_id, rnti);
continue;
}
- /* reduce max_num_ue once we are sure UE can be allocated, i.e., has CCE */
- max_num_ue--;
- if (max_num_ue < 0) return;
/* Find PUCCH occasion: if it fails, undo CCE allocation (undoing PUCCH
* allocation after CCE alloc fail would be more complex) */
@@ -829,9 +838,14 @@ void pf_dl(module_id_t module_id,
frame,
slot);
mac->pdcch_cand[cid]--;
- return;
+ continue;
}
+ /* reduce max_num_ue once we are sure UE can be allocated, i.e., has CCE
+ * and PUCCH */
+ max_num_ue--;
+ AssertFatal(max_num_ue >= 0, "Illegal max_num_ue %d\n", max_num_ue);
+
sched_ctrl->cce_index = CCEIndex;
fill_pdcch_vrb_map(mac,
@@ -846,6 +860,7 @@ void pf_dl(module_id_t module_id,
AssertFatal(tda>=0,"Unable to find PDSCH time domain allocation in list\n");
NR_sched_pdsch_t *sched_pdsch = &sched_ctrl->sched_pdsch;
NR_pdsch_semi_static_t *ps = &sched_ctrl->pdsch_semi_static;
+
if (ps->nrOfLayers != layers[UE_id] ||
ps->time_domain_allocation != tda)
nr_set_pdsch_semi_static(scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, bwpd, tda, layers[UE_id], sched_ctrl, ps);
@@ -873,6 +888,7 @@ void pf_dl(module_id_t module_id,
ps->nrOfSymbols,
ps->N_PRB_DMRS * ps->N_DMRS_SLOT,
sched_ctrl->num_total_bytes + oh,
+ min_rbSize,
max_rbSize,
&TBS,
&rbSize);
@@ -900,7 +916,10 @@ void nr_fr1_dlsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t
/* This is temporary and it assumes all UEs have the same BWP and TDA*/
int UE_id = UE_info->list.head;
NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
- const int tda = RC.nrmac[module_id]->preferred_dl_tda[sched_ctrl->active_bwp ? sched_ctrl->active_bwp->bwp_Id : 0][slot];
+ const int bwp_id = sched_ctrl->active_bwp ? sched_ctrl->active_bwp->bwp_Id : 0;
+ if (!RC.nrmac[module_id]->preferred_dl_tda[bwp_id])
+ return;
+ const int tda = RC.nrmac[module_id]->preferred_dl_tda[bwp_id][slot];
int startSymbolIndex, nrOfSymbols;
const struct NR_PDSCH_TimeDomainResourceAllocationList *tdaList = sched_ctrl->active_bwp ?
sched_ctrl->active_bwp->bwp_Common->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList :
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
index 64f6bb004bc7745252916ae5e166bc17cd24f6fa..6bfd369c6779446d07af92b954fddd6ed7ca8a3c 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
@@ -386,8 +386,6 @@ void nr_preprocessor_phytest(module_id_t module_id,
sched_pdsch->pucch_allocation = alloc;
sched_pdsch->rbStart = rbStart;
sched_pdsch->rbSize = rbSize;
- if (ps->time_domain_allocation != tda || ps->nrOfLayers != target_dl_Nl)
- nr_set_pdsch_semi_static(scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, NULL, tda, target_dl_Nl, sched_ctrl, ps);
sched_pdsch->mcs = target_dl_mcs;
sched_pdsch->Qm = nr_get_Qm_dl(sched_pdsch->mcs, ps->mcsTableIdx);
@@ -520,12 +518,14 @@ bool nr_ul_preprocessor_phytest(module_id_t module_id, frame_t frame, sub_frame_
sched_ctrl->coreset,
Y);
- if (sched_ctrl->cce_index < 0) {
+ if (CCEIndex < 0) {
LOG_E(MAC, "%s(): CCE list not empty, couldn't schedule PUSCH\n", __func__);
nr_mac->pdcch_cand[cid]--;
return false;
}
+ sched_ctrl->cce_index = CCEIndex;
+
const int mcs = target_ul_mcs;
NR_sched_pusch_t *sched_pusch = &sched_ctrl->sched_pusch;
sched_pusch->mcs = mcs;
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 4b957377dfd6dd4ded8440f3470a824753015bf6..3203b536f6933b59643495bc8307105cfb83076a 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -462,6 +462,7 @@ bool nr_find_nb_rb(uint16_t Qm,
uint16_t nb_symb_sch,
uint16_t nb_dmrs_prb,
uint32_t bytes,
+ uint16_t nb_rb_min,
uint16_t nb_rb_max,
uint32_t *tbs,
uint16_t *nb_rb)
@@ -477,7 +478,7 @@ bool nr_find_nb_rb(uint16_t Qm,
return true;
/* is the minimum enough? */
- *nb_rb = 5;
+ *nb_rb = nb_rb_min;
*tbs = nr_compute_tbs(Qm, R, *nb_rb, nb_symb_sch, nb_dmrs_prb, 0, 0, nrOfLayers) >> 3;
if (bytes <= *tbs)
return true;
@@ -485,7 +486,7 @@ bool nr_find_nb_rb(uint16_t Qm,
/* perform binary search to allocate all bytes within a TBS up to nb_rb_max
* RBs */
int hi = nb_rb_max;
- int lo = 1;
+ int lo = nb_rb_min;
for (int p = (hi + lo) / 2; lo + 1 < hi; p = (hi + lo) / 2) {
const uint32_t TBS = nr_compute_tbs(Qm, R, p, nb_symb_sch, nb_dmrs_prb, 0, 0, nrOfLayers) >> 3;
if (bytes == TBS) {
@@ -574,8 +575,8 @@ void nr_set_pdsch_semi_static(const NR_ServingCellConfigCommon_t *scc,
ps->nrOfLayers = 1;
}
else {
- LOG_D(NR_MAC,"checking layers\n");
- if (ps->nrOfLayers != layers) {
+ if (ps->nrOfLayers != layers ||
+ ps->numDmrsCdmGrpsNoData == 0) {
reset_dmrs = true;
ps->nrOfLayers = layers;
set_dl_dmrs_ports(ps);
@@ -583,6 +584,7 @@ void nr_set_pdsch_semi_static(const NR_ServingCellConfigCommon_t *scc,
}
ps->N_PRB_DMRS = ps->numDmrsCdmGrpsNoData * (ps->dmrsConfigType == NFAPI_NR_DMRS_TYPE1 ? 6 : 4);
+
if (reset_dmrs) {
ps->dl_dmrs_symb_pos = fill_dmrs_mask(bwpd ? bwpd->pdsch_Config->choice.setup : NULL, scc->dmrs_TypeA_Position, ps->nrOfSymbols, ps->startSymbolIndex, ps->mapping_type, ps->frontloaded_symb);
ps->N_DMRS_SLOT = get_num_dmrs(ps->dl_dmrs_symb_pos);
@@ -1935,14 +1937,46 @@ void dump_nr_list(NR_list_t *listP)
void create_nr_list(NR_list_t *list, int len)
{
list->head = -1;
- list->next = calloc(len, sizeof(*list->next));
- AssertFatal(list, "cannot calloc() memory for NR_list_t->next\n");
+ list->next = malloc(len * sizeof(*list->next));
+ LOG_W(NR_MAC, "NR list->next %p\n", list->next);
+ AssertFatal(list->next, "cannot malloc() memory for NR_list_t->next\n");
for (int i = 0; i < len; ++i)
list->next[i] = -1;
list->tail = -1;
list->len = len;
}
+/*
+ * Resize an NR_list
+ */
+void resize_nr_list(NR_list_t *list, int new_len)
+{
+ if (new_len == list->len)
+ return;
+ if (new_len > list->len) {
+ /* list->head remains */
+ const int old_len = list->len;
+ int* n = realloc(list->next, new_len * sizeof(*list->next));
+ AssertFatal(n, "cannot realloc() memory for NR_list_t->next\n");
+ list->next = n;
+ for (int i = old_len; i < new_len; ++i)
+ list->next[i] = -1;
+ /* list->tail remains */
+ list->len = new_len;
+ } else { /* new_len < len */
+ AssertFatal(list->head < new_len, "shortened list head out of index %d (new len %d)\n", list->head, new_len);
+ AssertFatal(list->tail < new_len, "shortened list tail out of index %d (new len %d)\n", list->head, new_len);
+ for (int i = 0; i < list->len; ++i)
+ AssertFatal(list->next[i] < new_len, "shortened list entry out of index %d (new len %d)\n", list->next[i], new_len);
+ /* list->head remains */
+ int *n = realloc(list->next, new_len * sizeof(*list->next));
+ AssertFatal(n, "cannot realloc() memory for NR_list_t->next\n");
+ list->next = n;
+ /* list->tail remains */
+ list->len = new_len;
+ }
+}
+
/*
* Destroy an NR_list
*/
@@ -2203,10 +2237,8 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellG
"no pdsch-ServingCellConfig found for UE %d\n",
UE_id);
const NR_PDSCH_ServingCellConfig_t *pdsch = servingCellConfig ? servingCellConfig->pdsch_ServingCellConfig->choice.setup : NULL;
- // add DL HARQ processes for this UE only in NSA
- // (SA still doesn't have information on nrofHARQ_ProcessesForPDSCH at this stage)
- if (!get_softmodem_params()->sa)
- create_dl_harq_list(sched_ctrl,pdsch);
+ // pdsch == NULL in SA -> will create default (8) number of HARQ processes
+ create_dl_harq_list(sched_ctrl, pdsch);
// add all available UL HARQ processes for this UE
// nb of ul harq processes not configurable
create_nr_list(&sched_ctrl->available_ul_harq, 16);
@@ -2234,11 +2266,23 @@ void create_dl_harq_list(NR_UE_sched_ctrl_t *sched_ctrl,
const int nrofHARQ = pdsch && pdsch->nrofHARQ_ProcessesForPDSCH ?
get_nrofHARQ_ProcessesForPDSCH(*pdsch->nrofHARQ_ProcessesForPDSCH) : 8;
// add all available DL HARQ processes for this UE
- create_nr_list(&sched_ctrl->available_dl_harq, nrofHARQ);
- for (int harq = 0; harq < nrofHARQ; harq++)
- add_tail_nr_list(&sched_ctrl->available_dl_harq, harq);
- create_nr_list(&sched_ctrl->feedback_dl_harq, nrofHARQ);
- create_nr_list(&sched_ctrl->retrans_dl_harq, nrofHARQ);
+ AssertFatal(sched_ctrl->available_dl_harq.len == sched_ctrl->feedback_dl_harq.len
+ && sched_ctrl->available_dl_harq.len == sched_ctrl->retrans_dl_harq.len,
+ "HARQ lists have different lengths (%d/%d/%d)\n",
+ sched_ctrl->available_dl_harq.len,
+ sched_ctrl->feedback_dl_harq.len,
+ sched_ctrl->retrans_dl_harq.len);
+ if (sched_ctrl->available_dl_harq.len == 0) {
+ create_nr_list(&sched_ctrl->available_dl_harq, nrofHARQ);
+ for (int harq = 0; harq < nrofHARQ; harq++)
+ add_tail_nr_list(&sched_ctrl->available_dl_harq, harq);
+ create_nr_list(&sched_ctrl->feedback_dl_harq, nrofHARQ);
+ create_nr_list(&sched_ctrl->retrans_dl_harq, nrofHARQ);
+ } else {
+ resize_nr_list(&sched_ctrl->available_dl_harq, nrofHARQ);
+ resize_nr_list(&sched_ctrl->feedback_dl_harq, nrofHARQ);
+ resize_nr_list(&sched_ctrl->retrans_dl_harq, nrofHARQ);
+ }
}
/* hack data to remove UE in the phy */
@@ -2390,12 +2434,12 @@ void get_pdsch_to_harq_feedback(int Mod_idP,
}
AssertFatal(found==1,"Couldn't find a ue specific searchspace\n");
-
if (ss->searchSpaceType->choice.ue_Specific->dci_Formats == NR_SearchSpace__searchSpaceType__ue_Specific__dci_Formats_formats0_0_And_1_0) {
for (int i=0; i<8; i++) {
pdsch_to_harq_feedback[i] = i+1;
if(pdsch_to_harq_feedback[i]>*max_fb_time)
*max_fb_time = pdsch_to_harq_feedback[i];
+
}
}
else {
@@ -2448,7 +2492,7 @@ void nr_csirs_scheduling(int Mod_idP,
for (int id = 0; id < csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.count; id++){
nzpcsi = csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.array[id];
NR_CSI_RS_ResourceMapping_t resourceMapping = nzpcsi->resourceMapping;
- csi_period_offset(NULL,nzpcsi,&period,&offset);
+ csi_period_offset(NULL,nzpcsi->periodicityAndOffset,&period,&offset);
if((frame*n_slots_frame+slot-offset)%period == 0) {
@@ -2496,7 +2540,7 @@ void nr_csirs_scheduling(int Mod_idP,
case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row2:
csirs_pdu_rel15->row = 2;
csirs_pdu_rel15->freq_domain = (((resourceMapping.frequencyDomainAllocation.choice.row2.buf[1]>>4)&0x0f) |
- ((resourceMapping.frequencyDomainAllocation.choice.row2.buf[0]<<8)&0xff0));
+ ((resourceMapping.frequencyDomainAllocation.choice.row2.buf[0]<<4)&0xff0));
for (int rb = csirs_pdu_rel15->start_rb; rb < (csirs_pdu_rel15->start_rb + csirs_pdu_rel15->nr_of_rbs); rb++)
vrb_map[rb+csirs_pdu_rel15->bwp_start] |= SL_to_bitmap(csirs_pdu_rel15->symb_l0, 1);
break;
@@ -2511,6 +2555,7 @@ void nr_csirs_scheduling(int Mod_idP,
// determining the row of table 7.4.1.5.3-1 in 38.211
switch(resourceMapping.nrofPorts){
case NR_CSI_RS_ResourceMapping__nrofPorts_p1:
+ AssertFatal(1==0,"Resource with 1 CSI port shouldn't be within other rows\n");
break;
case NR_CSI_RS_ResourceMapping__nrofPorts_p2:
csirs_pdu_rel15->row = 3;
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
index 366c09f142aa1bdd1b5b14e3c881e2099c37bf12..8ca409695e604ae02c7705229203b7f90d06902c 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
@@ -32,6 +32,7 @@
#include "NR_MAC_COMMON/nr_mac_extern.h"
#include "NR_MAC_gNB/mac_proto.h"
#include "common/ran_context.h"
+#include "common/utils/nr/nr_common.h"
#include "nfapi/oai_integration/vendor_ext.h"
extern RAN_CONTEXT_t RC;
@@ -1541,21 +1542,25 @@ int nr_acknack_scheduling(int mod_id,
int r_pucch,
int is_common) {
- const NR_ServingCellConfigCommon_t *scc = RC.nrmac[mod_id]->common_channels->ServingCellConfigCommon;
- const int n_slots_frame = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
- const NR_TDD_UL_DL_Pattern_t *tdd = &scc->tdd_UL_DL_ConfigurationCommon->pattern1;
- const int nr_mix_slots = tdd->nrofDownlinkSymbols != 0 || tdd->nrofUplinkSymbols != 0;
- const int nr_slots_period = tdd->nrofDownlinkSlots + tdd->nrofUplinkSlots + nr_mix_slots;
- const int first_ul_slot_tdd = tdd->nrofDownlinkSlots + nr_slots_period * (slot / nr_slots_period);
- const int first_ul_slot_period = tdd->nrofDownlinkSlots;
const int CC_id = 0;
- NR_sched_pucch_t *csi_pucch;
+ const int minfbtime = RC.nrmac[mod_id]->minRXTXTIMEpdsch;
+ const NR_ServingCellConfigCommon_t *scc = RC.nrmac[mod_id]->common_channels[CC_id].ServingCellConfigCommon;
+ const int n_slots_frame = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
+ const NR_TDD_UL_DL_Pattern_t *tdd = scc->tdd_UL_DL_ConfigurationCommon ? &scc->tdd_UL_DL_ConfigurationCommon->pattern1 : NULL;
+ // initializing the values for FDD
+ int nr_slots_period = n_slots_frame;
+ int first_ul_slot_tdd = slot + minfbtime;
+ int first_ul_slot_period = 0;
+ if(tdd){
+ nr_slots_period /= get_nb_periods_per_frame(tdd->dl_UL_TransmissionPeriodicity);
+ first_ul_slot_tdd = tdd->nrofDownlinkSlots + nr_slots_period * (slot / nr_slots_period);
+ first_ul_slot_period = tdd->nrofDownlinkSlots;
+ }
+ else
+ // if TDD configuration is not present and the band is not FDD, it means it is a dynamic TDD configuration
+ AssertFatal(RC.nrmac[mod_id]->common_channels[CC_id].frame_type == FDD,"Dynamic TDD not handled yet\n");
- AssertFatal(slot < first_ul_slot_tdd + (tdd->nrofUplinkSymbols != 0),
- "cannot handle multiple TDD periods (yet): slot %d first_ul_slot_tdd %d nrofUplinkSlots %ld\n",
- slot,
- first_ul_slot_tdd,
- tdd->nrofUplinkSlots);
+ NR_sched_pucch_t *csi_pucch;
/* for the moment, we consider:
* * only pucch_sched[0] holds HARQ (and SR)
@@ -1565,19 +1570,21 @@ int nr_acknack_scheduling(int mod_id,
* * each UE has dedicated PUCCH Format 0 resources, and we use index 0! */
NR_UE_sched_ctrl_t *sched_ctrl = &RC.nrmac[mod_id]->UE_info.UE_sched_ctrl[UE_id];
NR_sched_pucch_t *pucch = &sched_ctrl->sched_pucch[0];
- LOG_D(NR_MAC,"pucch_acknak %d.%d Trying to allocate pucch, current DAI %d\n",frame,slot,pucch->dai_c);
+ LOG_D(NR_MAC, "In %s: %d.%d Trying to allocate pucch, current DAI %d\n", __FUNCTION__, frame, slot, pucch->dai_c);
+
pucch->r_pucch=r_pucch;
AssertFatal(pucch->csi_bits == 0,
"%s(): csi_bits %d in sched_pucch[0]\n",
__func__,
pucch->csi_bits);
+
/* if the currently allocated PUCCH of this UE is full, allocate it */
if (pucch->dai_c == 2) {
/* advance the UL slot information in PUCCH by one so we won't schedule in
* the same slot again */
const int f = pucch->frame;
const int s = pucch->ul_slot;
- LOG_D(NR_MAC,"pucch_acknak : %d.%d DAI = 2 pucch currently in %d.%d, advancing by 1 slot\n",frame,slot,f,s);
+ LOG_D(NR_MAC, "In %s: %d.%d DAI = 2 pucch currently in %d.%d, advancing by 1 slot\n", __FUNCTION__, frame, slot, f, s);
nr_fill_nfapi_pucch(mod_id, frame, slot, pucch, UE_id);
memset(pucch, 0, sizeof(*pucch));
pucch->frame = s == n_slots_frame - 1 ? (f + 1) % 1024 : f;
@@ -1605,7 +1612,7 @@ int nr_acknack_scheduling(int mod_id,
}
}
- LOG_D(NR_MAC,"pucch_acknak 1. DL %d.%d, UL_ACK %d.%d, DAI_C %d\n",frame,slot,pucch->frame,pucch->ul_slot,pucch->dai_c);
+ LOG_D(NR_MAC, "In %s: pucch_acknak 1. DL %d.%d, UL_ACK %d.%d, DAI_C %d\n", __FUNCTION__, frame, slot, pucch->frame, pucch->ul_slot, pucch->dai_c);
// this is hardcoded for now as ue specific only if we are not on the initialBWP (to be fixed to allow ue_Specific also on initialBWP
NR_CellGroupConfig_t *cg = RC.nrmac[mod_id]->UE_info.CellGroup[UE_id];
@@ -1626,7 +1633,7 @@ int nr_acknack_scheduling(int mod_id,
int max_fb_time = 0;
get_pdsch_to_harq_feedback(mod_id, UE_id, bwp_Id, ss_type, &max_fb_time, pdsch_to_harq_feedback);
- LOG_D(NR_MAC,"pucch_acknak 1b. DL %d.%d, UL_ACK %d.%d, DAI_C %d\n",frame,slot,pucch->frame,pucch->ul_slot,pucch->dai_c);
+ LOG_D(NR_MAC, "In %s: 1b. DL %d.%d, UL_ACK %d.%d, DAI_C %d\n", __FUNCTION__, frame,slot,pucch->frame,pucch->ul_slot,pucch->dai_c);
/* there is a HARQ. Check whether we can use it for this ACKNACK */
if (pucch->dai_c > 0) {
/* this UE already has a PUCCH occasion */
@@ -1636,7 +1643,8 @@ int nr_acknack_scheduling(int mod_id,
int diff = pucch->ul_slot - slot;
if (diff<0)
diff += n_slots_frame;
- if (pdsch_to_harq_feedback[i] == diff)
+ if (pdsch_to_harq_feedback[i] == diff &&
+ pdsch_to_harq_feedback[i] >= minfbtime)
break;
++i;
}
@@ -1645,7 +1653,7 @@ int nr_acknack_scheduling(int mod_id,
const int f = pucch->frame;
const int s = pucch->ul_slot;
const int n_slots_frame = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
- LOG_D(NR_MAC,"pucch_acknak : %d.%d DAI > 0, cannot reach timing for pucch in %d.%d, advancing slot by 1 and trying again\n",frame,slot,f,s);
+ LOG_D(NR_MAC, "In %s: %d.%d DAI > 0, cannot reach timing for pucch in %d.%d, advancing slot by 1 and trying again\n", __FUNCTION__, frame, slot, f, s);
nr_fill_nfapi_pucch(mod_id, frame, slot, pucch, UE_id);
memset(pucch, 0, sizeof(*pucch));
pucch->frame = s == n_slots_frame - 1 ? (f + 1) % 1024 : f;
@@ -1659,11 +1667,11 @@ int nr_acknack_scheduling(int mod_id,
pucch->timing_indicator = i;
pucch->dai_c++;
// retain old resource indicator, and we are good
- LOG_D(NR_MAC,"pucch_acknak : %d.%d. DAI > 0, pucch allocated for %d.%d (index %d)\n",frame,slot,pucch->frame,pucch->ul_slot,pucch->timing_indicator);
+ LOG_D(NR_MAC, "In %s: %d.%d. DAI > 0, pucch allocated for %d.%d (index %d)\n", __FUNCTION__, frame,slot,pucch->frame,pucch->ul_slot,pucch->timing_indicator);
return 0;
}
- LOG_D(NR_MAC,"pucch_acknak : %d.%d DAI = 0, looking for new pucch occasion\n",frame,slot);
+ LOG_D(NR_MAC, "In %s: %d.%d DAI = 0, looking for new pucch occasion\n", __FUNCTION__, frame, slot);
/* we need to find a new PUCCH occasion */
/*(Re)Inizialization of timing information*/
@@ -1673,8 +1681,9 @@ int nr_acknack_scheduling(int mod_id,
AssertFatal(pucch->sr_flag + pucch->dai_c == 0,
"expected no SR/AckNack for UE %d in %4d.%2d, but has %d/%d for %4d.%2d\n",
UE_id, frame, slot, pucch->sr_flag, pucch->dai_c, pucch->frame, pucch->ul_slot);
- pucch->frame = frame;
- pucch->ul_slot = first_ul_slot_tdd;
+ const int s = first_ul_slot_tdd;
+ pucch->frame = (s < n_slots_frame - 1) ? frame : (frame + 1) % 1024;
+ pucch->ul_slot = s % n_slots_frame;
}
// Find the right timing_indicator value.
@@ -1683,12 +1692,13 @@ int nr_acknack_scheduling(int mod_id,
while ((n_slots_frame + pucch->ul_slot - slot) % n_slots_frame <= max_fb_time) {
int i = 0;
while (i < 8) {
- LOG_D(NR_MAC,"pdsch_to_harq_feedback[%d] = %d (pucch->ul_slot %d - slot %d)\n",
+ LOG_D(NR_MAC, "In %s: pdsch_to_harq_feedback[%d] = %d (pucch->ul_slot %d - slot %d)\n", __FUNCTION__,
i,pdsch_to_harq_feedback[i],pucch->ul_slot,slot);
int diff = pucch->ul_slot - slot;
if (diff<0)
diff += n_slots_frame;
- if (pdsch_to_harq_feedback[i] == diff) {
+ if (pdsch_to_harq_feedback[i] == diff &&
+ pdsch_to_harq_feedback[i] >= minfbtime) {
ind_found = i;
break;
}
@@ -1754,7 +1764,7 @@ int nr_acknack_scheduling(int mod_id,
pucch->timing_indicator = ind_found; // index in the list of timing indicators
- LOG_D(NR_MAC,"pucch_acknak 2. DAI 0 DL %d.%d, UL_ACK %d.%d (index %d)\n",frame,slot,pucch->frame,pucch->ul_slot,pucch->timing_indicator);
+ LOG_D(NR_MAC, "In %s: 2. DAI 0 DL %d.%d, UL_ACK %d.%d (index %d)\n", __FUNCTION__, frame,slot,pucch->frame,pucch->ul_slot,pucch->timing_indicator);
pucch->dai_c++;
pucch->resource_indicator = 0; // each UE has dedicated PUCCH resources
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index eb51f1ca2678985cd6f09ec6ec6a488895fc3062..702163d85e66b62b79305890bec91e0121e24552 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -60,11 +60,23 @@ void calculate_preferred_ul_tda(module_id_t module_id, const NR_BWP_Uplink_t *ub
/* there is a mixed slot only when in TDD */
NR_ServingCellConfigCommon_t *scc = nrmac->common_channels->ServingCellConfigCommon;
+ lte_frame_type_t frame_type = nrmac->common_channels->frame_type;
+ const int n = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
const int mu = scc->uplinkConfigCommon->initialUplinkBWP->genericParameters.subcarrierSpacing;
const NR_TDD_UL_DL_Pattern_t *tdd =
scc->tdd_UL_DL_ConfigurationCommon ? &scc->tdd_UL_DL_ConfigurationCommon->pattern1 : NULL;
/* Uplink symbols are at the end of the slot */
- const int symb_ulMixed = tdd ? ((1 << tdd->nrofUplinkSymbols) - 1) << (14 - tdd->nrofUplinkSymbols) : 0;
+ int symb_ulMixed = 0;
+ int nr_mix_slots = 0;
+ int nr_slots_period = n;
+ if (tdd) {
+ symb_ulMixed = ((1 << tdd->nrofUplinkSymbols) - 1) << (14 - tdd->nrofUplinkSymbols);
+ nr_mix_slots = tdd->nrofDownlinkSymbols != 0 || tdd->nrofUplinkSymbols != 0;
+ nr_slots_period /= get_nb_periods_per_frame(tdd->dl_UL_TransmissionPeriodicity);
+ }
+ else
+ // if TDD configuration is not present and the band is not FDD, it means it is a dynamic TDD configuration
+ AssertFatal(nrmac->common_channels->frame_type == FDD,"Dynamic TDD not handled yet\n");
const struct NR_PUCCH_Config__resourceToAddModList *resList = ubwp->bwp_Dedicated->pucch_Config->choice.setup->resourceToAddModList;
// for the moment, just block any symbol that might hold a PUCCH, regardless
@@ -117,7 +129,7 @@ void calculate_preferred_ul_tda(module_id_t module_id, const NR_BWP_Uplink_t *ub
// get largest time domain allocation (TDA) for UL slot and UL in mixed slot
int tdaMi = -1;
- if(tdaList->list.count > 1) {
+ if (nr_mix_slots>0) {
const NR_PUSCH_TimeDomainResourceAllocation_t *tdaP_Mi = tdaList->list.array[1];
AssertFatal(k2 == get_K2(scc, (NR_BWP_Uplink_t*)ubwp, 1, mu),
"scheduler cannot handle different k2 for UL slot (%d) and UL Mixed slot (%ld)\n",
@@ -139,27 +151,25 @@ void calculate_preferred_ul_tda(module_id_t module_id, const NR_BWP_Uplink_t *ub
symb_tda_mi);
}
}
- const uint8_t slots_per_frame[5] = {10, 20, 40, 80, 160};
- const int n = slots_per_frame[*scc->ssbSubcarrierSpacing];
+
nrmac->preferred_ul_tda[bwp_id] = malloc(n * sizeof(*nrmac->preferred_ul_tda[bwp_id]));
- const int nr_mix_slots = tdd ? tdd->nrofDownlinkSymbols != 0 || tdd->nrofUplinkSymbols != 0 : 0;
- const int nr_slots_period = tdd ? tdd->nrofDownlinkSlots + tdd->nrofUplinkSlots + nr_mix_slots : n;
for (int slot = 0; slot < n; ++slot) {
const int sched_slot = (slot + k2) % n;
nrmac->preferred_ul_tda[bwp_id][slot] = -1;
- if (!tdd || sched_slot % nr_slots_period >= tdd->nrofDownlinkSlots + nr_mix_slots)
+ if (frame_type == FDD || sched_slot % nr_slots_period >= tdd->nrofDownlinkSlots + nr_mix_slots)
nrmac->preferred_ul_tda[bwp_id][slot] = 0;
- else if (tdd && nr_mix_slots && sched_slot % nr_slots_period == tdd->nrofDownlinkSlots)
+ else if (nr_mix_slots && sched_slot % nr_slots_period == tdd->nrofDownlinkSlots)
nrmac->preferred_ul_tda[bwp_id][slot] = tdaMi;
LOG_D(MAC, "DL slot %d UL slot %d preferred_ul_tda %d\n", slot, sched_slot, nrmac->preferred_ul_tda[bwp_id][slot]);
}
- if (k2 < tdd->nrofUplinkSlots)
+ if (tdd && k2 < tdd->nrofUplinkSlots) {
LOG_W(NR_MAC,
"k2 %d < tdd->nrofUplinkSlots %ld: not all UL slots can be scheduled\n",
k2,
tdd->nrofUplinkSlots);
+ }
}
// For both UL-SCH except:
@@ -712,7 +722,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
UE_info->UE_sched_ctrl[UE_id].pusch_consecutive_dtx_cnt++;
UE_info->mac_stats[UE_id].ulsch_DTX++;
}
- if (UE_info->UE_sched_ctrl[UE_id].pusch_consecutive_dtx_cnt >= pusch_failure_thres) {
+ if (!get_softmodem_params()->phy_test && UE_info->UE_sched_ctrl[UE_id].pusch_consecutive_dtx_cnt >= pusch_failure_thres) {
LOG_W(NR_MAC,"%d.%d Detected UL Failure on PUSCH after %d PUSCH DTX, stopping scheduling\n",
frameP,slotP,UE_info->UE_sched_ctrl[UE_id].pusch_consecutive_dtx_cnt);
UE_info->UE_sched_ctrl[UE_id].ul_failure = 1;
@@ -905,8 +915,7 @@ long get_K2(NR_ServingCellConfigCommon_t *scc,NR_BWP_Uplink_t *ubwp, int time_do
bool nr_UE_is_to_be_scheduled(module_id_t mod_id, int CC_id, int UE_id, frame_t frame, sub_frame_t slot)
{
const NR_ServingCellConfigCommon_t *scc = RC.nrmac[mod_id]->common_channels->ServingCellConfigCommon;
- const uint8_t slots_per_frame[5] = {10, 20, 40, 80, 160};
- const int n = slots_per_frame[*scc->ssbSubcarrierSpacing];
+ const int n = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
const int now = frame * n + slot;
const struct gNB_MAC_INST_s *nrmac = RC.nrmac[mod_id];
@@ -1012,6 +1021,7 @@ bool allocate_ul_retransmission(module_id_t module_id,
temp_ps.nrOfSymbols,
temp_ps.N_PRB_DMRS * temp_ps.num_dmrs_symb,
retInfo->tb_size,
+ 1, /* minimum of 1RB: need to find exact TBS, don't preclude any number */
rbSize,
&new_tbs,
&new_rbSize);
@@ -1026,9 +1036,6 @@ bool allocate_ul_retransmission(module_id_t module_id,
retInfo->rbSize = new_rbSize;
retInfo->time_domain_allocation = tda;
sched_ctrl->pusch_semi_static = temp_ps;
-
- // Get previous PUSCH filed info
- sched_ctrl->sched_pusch = *retInfo;
}
/* Find a free CCE */
@@ -1267,8 +1274,9 @@ void pf_ul(module_id_t module_id,
}
+ const int min_rbSize = 5;
/* Loop UE_sched to find max coeff and allocate transmission */
- while (UE_sched.head >= 0 && max_num_ue> 0 && n_rb_sched > 0) {
+ while (UE_sched.head >= 0 && max_num_ue> 0 && n_rb_sched >= min_rbSize) {
/* Find max coeff */
int *max = &UE_sched.head; /* Find max coeff: assume head is max */
int *p = &UE_sched.next[*max];
@@ -1314,8 +1322,7 @@ void pf_ul(module_id_t module_id,
/* reduce max_num_ue once we are sure UE can be allocated, i.e., has CCE */
max_num_ue--;
- if (max_num_ue < 0)
- return;
+ AssertFatal(max_num_ue >= 0, "Illegal max_num_ue %d\n", max_num_ue);
NR_CellGroupConfig_t *cg = UE_info->CellGroup[UE_id];
NR_BWP_UplinkDedicated_t *ubwpd= cg ? cg->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP:NULL;
@@ -1362,6 +1369,7 @@ void pf_ul(module_id_t module_id,
ps->nrOfSymbols,
ps->N_PRB_DMRS * ps->num_dmrs_symb,
B,
+ min_rbSize,
max_rbSize,
&TBS,
&rbSize);
@@ -1414,8 +1422,13 @@ bool nr_fr1_ulsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t
if (!is_xlsch_in_slot(nr_mac->ulsch_slot_bitmap[sched_slot / 64], sched_slot))
return false;
- bool is_mixed_slot = is_xlsch_in_slot(nr_mac->dlsch_slot_bitmap[sched_slot / 64], sched_slot) &&
- is_xlsch_in_slot(nr_mac->ulsch_slot_bitmap[sched_slot / 64], sched_slot);
+ bool is_mixed_slot = false;
+ const NR_TDD_UL_DL_Pattern_t *tdd =
+ scc->tdd_UL_DL_ConfigurationCommon ? &scc->tdd_UL_DL_ConfigurationCommon->pattern1 : NULL;
+
+ if (tdd)
+ is_mixed_slot = is_xlsch_in_slot(nr_mac->dlsch_slot_bitmap[sched_slot / 64], sched_slot) &&
+ is_xlsch_in_slot(nr_mac->ulsch_slot_bitmap[sched_slot / 64], sched_slot);
// FIXME: Avoid mixed slots for initialUplinkBWP
if (sched_ctrl->active_ubwp==NULL && is_mixed_slot)
diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
index ec814292cc6506ce3df3eb435d3cd968ba6c8037..28e9d689fa6f40ecd7a9cb622e2b4e87e1b1a84a 100644
--- a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
@@ -50,10 +50,11 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
int pdsch_AntennaPorts,
int pusch_AntennaPorts,
int sib1_tda,
+ int minRXTXTIMEpdsch,
NR_ServingCellConfigCommon_t *scc,
NR_BCCH_BCH_Message_t *mib,
- int add_ue,
- uint32_t rnti,
+ int add_ue,
+ uint32_t rnti,
NR_CellGroupConfig_t *CellGroup);
void clear_nr_nfapi_information(gNB_MAC_INST * gNB,
@@ -350,6 +351,7 @@ int NRRIV2PRBOFFSET(int locationAndBandwidth,int N_RB);
/* Functions to manage an NR_list_t */
void dump_nr_list(NR_list_t *listP);
void create_nr_list(NR_list_t *listP, int len);
+void resize_nr_list(NR_list_t *list, int new_len);
void destroy_nr_list(NR_list_t *list);
void add_nr_list(NR_list_t *listP, int id);
void remove_nr_list(NR_list_t *listP, int id);
@@ -472,6 +474,7 @@ bool nr_find_nb_rb(uint16_t Qm,
uint16_t nb_symb_sch,
uint16_t nb_dmrs_prb,
uint32_t bytes,
+ uint16_t nb_rb_min,
uint16_t nb_rb_max,
uint32_t *tbs,
uint16_t *nb_rb);
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
index d78fe4e154dce85f359a9c709a5953b21b6cb2c3..0eb685ee7ad879a545dc4bcf39571cad13285f5b 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
@@ -716,6 +716,7 @@ typedef struct gNB_MAC_INST_s {
int ssb_SubcarrierOffset;
/// SIB1 Time domain allocation
int sib1_tda;
+ int minRXTXTIMEpdsch;
/// Common cell resources
NR_COMMON_channels_t common_channels[NFAPI_CC_MAX];
/// current PDU index (BCH,DLSCH)
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
index 4d2e157728bb9595929924a819332f70bc038e8b..108a5dbe91435b6e1265360d2abc5c14df37e097 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
@@ -48,7 +48,6 @@
#include "platform_constants.h"
#include "nfapi/oai_integration/vendor_ext.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
-#include "msc.h"
#include "common/ngran_types.h"
#include "targets/COMMON/openairinterface5g_limits.h"
#include "targets/RT/USER/lte-softmodem.h"
@@ -60,7 +59,6 @@
#include <pthread.h>
# include "gtpv1u_eNB_task.h"
-# include "gtpv1u.h"
#include <openair3/ocp-gtpu/gtp_itf.h>
#include "ENB_APP/enb_config.h"
@@ -229,7 +227,7 @@ rlc_op_status_t cu_send_to_du(const protocol_ctxt_t *const ctxt,
LOG_D(PDCP, "%s() (drb %ld) sending message to gtp size %d\n",
__func__, rb_id, size);
extern instance_t CUuniqInstance;
- itti_send_msg_to_task(TASK_VARIABLE, CUuniqInstance, message_p);
+ itti_send_msg_to_task(TASK_GTPV1_U, CUuniqInstance, message_p);
return TRUE;
}
@@ -1058,14 +1056,6 @@ pdcp_data_ind(
ctxt_pP->rnti,
rb_id + 4,
sdu_buffer_sizeP - payload_offset );
- MSC_LOG_TX_MESSAGE(
- MSC_PDCP_ENB,
- MSC_GTPU_ENB,
- NULL,0,
- "0 GTPV1U_ENB_TUNNEL_DATA_REQ ue %x rab %u len %u",
- ctxt_pP->rnti,
- rb_id + 4,
- sdu_buffer_sizeP - payload_offset);
//LOG_T(PDCP,"Sending to GTPV1U %d bytes\n", sdu_buffer_sizeP - payload_offset);
gtpu_buffer_p = itti_malloc(TASK_PDCP_ENB, TASK_GTPV1_U,
sdu_buffer_sizeP - payload_offset + GTPU_HEADER_OVERHEAD_MAX);
@@ -1078,7 +1068,7 @@ pdcp_data_ind(
GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).offset = GTPU_HEADER_OVERHEAD_MAX;
GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).rnti = ctxt_pP->rnti;
GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).rab_id = rb_id + 4;
- itti_send_msg_to_task(TASK_VARIABLE, INSTANCE_DEFAULT, message_p);
+ itti_send_msg_to_task(TASK_GTPV1_U, INSTANCE_DEFAULT, message_p);
packet_forwarded = TRUE;
}
} else {
@@ -2228,20 +2218,6 @@ pdcp_config_set_security(
pdcp_pP->kUPenc = kUPenc;
/* Activate security */
pdcp_pP->security_activated = 1;
- MSC_LOG_EVENT(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- "0 Set security ciph %X integ %x UE %"PRIx16" ",
- pdcp_pP->cipheringAlgorithm,
- pdcp_pP->integrityProtAlgorithm,
- ctxt_pP->rnti);
- } else {
- MSC_LOG_EVENT(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- "0 Set security failed UE %"PRIx16" ",
- ctxt_pP->rnti);
- LOG_E(PDCP,PROTOCOL_PDCP_CTXT_FMT" bad security mode %d",
- PROTOCOL_PDCP_CTXT_ARGS(ctxt_pP,pdcp_pP),
- security_modeP);
}
}
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
index b49b02042821d8d0c3071858703faa179dfce9bf..f6a61330d068c5366a55478f9dbe0fb0d51a4d1e 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
@@ -58,7 +58,6 @@ extern int otg_enabled;
#include "nfapi/oai_integration/vendor_ext.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
#include "platform_constants.h"
-#include "msc.h"
#include "pdcp.h"
#include "assertions.h"
@@ -85,8 +84,6 @@ extern struct msghdr nas_msg_rx;
# include "gtpv1u_eNB_task.h"
-# include "gtpv1u_eNB_defs.h"
-
extern int gtpv1u_new_data_req( uint8_t enb_module_idP, rnti_t ue_rntiP, uint8_t rab_idP, uint8_t *buffer_pP, uint32_t buf_lenP, uint32_t buf_offsetP);
uint16_t ue_id_g; // Global variable to identify the ID for each UE. It is updated in main() of lte-uesoftmodem.c
@@ -343,12 +340,6 @@ int pdcp_fifo_read_input_mbms_sdus_fromtun (const protocol_ctxt_t *const ctxt_p
LOG_D(PDCP, "[FRAME %5u][UE][IP][INSTANCE %ld][RB %ld][--- PDCP_DATA_REQ / %d Bytes --->][PDCP][MOD %u][UE %04x][RB %ld]\n",
ctxt.frame, ctxt.instance, rab_id, len, ctxt.module_id,
ctxt.rnti, rab_id);
- MSC_LOG_RX_MESSAGE((ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_IP_ENB:MSC_IP_UE,
- NULL, 0,
- MSC_AS_TIME_FMT" DATA-REQ inst %u rb %u rab %u size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ctxt.instance, rab_id, rab_id, len);
pdcp_data_req(
&ctxt,
SRB_FLAG_NO,
@@ -368,14 +359,6 @@ int pdcp_fifo_read_input_mbms_sdus_fromtun (const protocol_ctxt_t *const ctxt_p
// , NULL, NULL
// );
} else {
- MSC_LOG_RX_DISCARDED_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_IP_ENB:MSC_IP_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" DATA-REQ inst %u rb %u rab %u size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ctxt.instance, rab_id, rab_id, len);
LOG_D(PDCP,
"[FRAME %5u][UE][IP][INSTANCE %ld][RB %ld][--- PDCP_DATA_REQ / %d Bytes ---X][PDCP][MOD %u][UE %04x][RB %ld] NON INSTANCIATED INSTANCE key 0x%"PRIx64", DROPPED\n",
ctxt.frame, ctxt.instance, rab_id, len, ctxt.module_id,
@@ -566,17 +549,6 @@ int pdcp_fifo_read_input_sdus_fromnetlinksock (const protocol_ctxt_t *const ctx
(NFAPI_MODE == NFAPI_UE_STUB_PNF || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF) ? NULL : &pdcp_read_header_g.destinationL2Id
);
} else { /* else of h_rc == HASH_TABLE_OK */
- MSC_LOG_RX_DISCARDED_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_IP_ENB:MSC_IP_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" DATA-REQ inst %u rb %u rab %u size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- pdcp_read_header_g.inst,
- pdcp_read_header_g.rb_id,
- rab_id,
- pdcp_read_header_g.data_size);
LOG_D(PDCP,
"[FRAME %5u][UE][IP][INSTANCE %u][RB %ld][--- PDCP_DATA_REQ / %d Bytes ---X][PDCP][MOD %u][UE %u][RB %ld] NON INSTANCIATED INSTANCE key 0x%"PRIx64", DROPPED\n",
ctxt.frame,
@@ -739,17 +711,6 @@ void pdcp_fifo_read_input_sdus_frompc5s (const protocol_ctxt_t *const ctxt_pP)
ctxt.module_id,
ctxt.rnti,
rab_id);
- MSC_LOG_RX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_IP_ENB:MSC_IP_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" DATA-REQ inst %u rb %u rab %u size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- pc5s_header->inst,
- pc5s_header->rb_id,
- rab_id,
- pc5s_header->data_size);
/* pointers to pc5s_header fields possibly not aligned because pc5s_header points to a packed structure
* Using these possibly unaligned pointers in a function call may trigger alignment errors at run time and
* gcc, from v9, now warns about it. fix these warnings by using local variables
@@ -771,17 +732,6 @@ void pdcp_fifo_read_input_sdus_frompc5s (const protocol_ctxt_t *const ctxt_pP)
pc5s_header->sourceL2Id = sourceL2Id;
pc5s_header->destinationL2Id=destinationL2Id;
} else { /* else of h_rc == HASH_TABLE_OK */
- MSC_LOG_RX_DISCARDED_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_IP_ENB:MSC_IP_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" DATA-REQ inst %u rb %u rab %u size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- pc5s_header->inst,
- pc5s_header->rb_id,
- rab_id,
- pc5s_header->data_size);
LOG_D(PDCP,
"[FRAME %5u][UE][IP][INSTANCE %u][RB %ld][--- PDCP_DATA_REQ / %d Bytes ---X][PDCP][MOD %u][UE %u][RB %ld] NON INSTANCIATED INSTANCE key 0x%"PRIx64", DROPPED\n",
ctxt.frame,
@@ -803,16 +753,6 @@ void pdcp_fifo_read_input_sdus_frompc5s (const protocol_ctxt_t *const ctxt_pP)
ctxt.module_id,
ctxt.rnti,
DEFAULT_RAB_ID);
- MSC_LOG_RX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_IP_ENB:MSC_IP_UE,
- NULL,0,
- MSC_AS_TIME_FMT" DATA-REQ inst %u rb %u default rab %u size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- pc5s_header->inst,
- pc5s_header->rb_id,
- DEFAULT_RAB_ID,
- pc5s_header->data_size);
/* pointers to pc5s_header fields possibly not aligned because pc5s_header points to a packed structure
* Using these possibly unaligned pointers in a function call may trigger alignment errors at run time and
* gcc, from v9, now warns about it. fix these warnings by using local variables
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_netlink.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp_netlink.c
index 891c38209b5eda9637cc17fabb7c81c186d24eb0..0bd1b8fa8d277ba4803fd3936cda865cd6695bd3 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_netlink.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_netlink.c
@@ -60,7 +60,6 @@
#include "pdcp.h"
#include "pdcp_primitives.h"
-#include "msc.h"
#define PDCP_QUEUE_NB_ELEMENTS 200
@@ -187,7 +186,6 @@ void *pdcp_netlink_thread_fct(void *arg)
pdcp_thread_read_state = 0;
memset(nl_rx_buf, 0, NL_MAX_PAYLOAD);
LOG_I(PDCP, "[NETLINK_THREAD] binding to fd %d\n",nas_sock_fd);
- MSC_START_USE();
while (1) {
len = recvmsg(nas_sock_fd, &nas_msg_rx, 0);
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_security.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp_security.c
index cb108f5d260c9f0186d00f52ce7e78b54ef3dfad..6664dd2a33eb961e3aebd7f4bdd65fbb464c0c3f 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_security.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_security.c
@@ -37,7 +37,6 @@
#include "LAYER2/MAC/mac_extern.h"
#include "pdcp.h"
-#include "msc.h"
#include "pdcp_primitives.h"
//-----------------------------------------------------------------------------
@@ -223,11 +222,6 @@ pdcp_validate_security(
if (stream_check_integrity(pdcp_pP->integrityProtAlgorithm,
&decrypt_params,
&pdcp_pdu_buffer[sdu_buffer_size]) != 0) {
- MSC_LOG_EVENT(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- " Security: failed MAC-I Algo %X UE %"PRIx16" ",
- pdcp_pP->integrityProtAlgorithm,
- ctxt_pP->rnti);
LOG_E(PDCP, "[OSA][RB %ld] %s failed to validate MAC-I (key %llx) of incoming PDU\n",
rb_id, (pdcp_pP->is_ue != 0) ? "UE" : "eNB",((long long unsigned int*)decrypt_params.key)[0]);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCP_VALIDATE_SECURITY, VCD_FUNCTION_OUT);
diff --git a/openair2/LAYER2/PROTO_AGENT/cu_test.c b/openair2/LAYER2/PROTO_AGENT/cu_test.c
deleted file mode 100644
index a26b06dd413299037cbd5fbf90d2cb849e23a189..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PROTO_AGENT/cu_test.c
+++ /dev/null
@@ -1,172 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/time.h>
-
-#include "ENB_APP/enb_paramdef.h"
-#include "LAYER2/PROTO_AGENT/proto_agent.h"
-#define BUF_MAX 1400
-
-int recv_client = 0;
-FILE *output;
-
-void usage(char *prg_name) {
- fprintf(stderr, "usage: %s <file or ->\n", prg_name);
- fprintf(stderr, " - is stdin\n");
- fprintf(stderr, " received packets are written to stdout\n");
-}
-
-long uelapsed(struct timeval *s, struct timeval *e) {
- return e->tv_sec * 1000000 + e->tv_usec - (s->tv_sec * 1000000 + s->tv_usec);
-}
-
-boolean_t
-pdcp_data_ind(
- const protocol_ctxt_t *const ctxt_pP,
- const srb_flag_t srb_flagP,
- const MBMS_flag_t MBMS_flagP,
- const rb_id_t rb_idP,
- const sdu_size_t sdu_buffer_sizeP,
- mem_block_t *const sdu_buffer_pP
-) {
- fwrite(sdu_buffer_pP->data, sdu_buffer_sizeP, 1, stdout);
- fflush(stdout);
- free_mem_block(sdu_buffer_pP, __func__);
- /* cannot free because of const */
- //free(ctxt_pP);
- recv_client = 1;
- return 0;
-}
-
-void close_proto_agent(void) {
- proto_agent_stop(0);
-}
-
-int main(int argc, char *argv[]) {
- const cudu_params_t params = {
- .local_ipv4_address = "192.168.12.45",
- .local_port = 6464,
- .remote_ipv4_address = "192.168.12.45",
- .remote_port = 6465
- };
- protocol_ctxt_t p;
- memset(&p, 0, sizeof p);
- mem_block_t mem;
- char s[BUF_MAX];
- size_t size, totsize = 0;
- struct timeval t_start, t_end;
- FILE *f;
-
- if (argc != 2) {
- usage(argv[0]);
- return 1;
- }
-
- if (strcmp(argv[1], "-") == 0) {
- f = stdin;
- } else {
- f = fopen(argv[1], "r");
- }
-
- if (!f) {
- fprintf(stderr, "cannot open %s: %s\n", argv[1], strerror(errno));
- return 2;
- }
-
- pool_buffer_init();
-
- if (proto_agent_start(0, ¶ms) != 0) {
- fprintf(stderr, "error on proto_agent_start()\n");
- fclose(f);
- return 3;
- }
-
- atexit(close_proto_agent);
-
- /* wait for first packet of client */
- while (!recv_client) sleep(1);
-
- fprintf(stderr, "reading file\n");
- /* now send back at the same time */
- gettimeofday(&t_start, NULL);
-
- while ((size = fread(s, 1, BUF_MAX, f)) > 0) {
- usleep(10);
- totsize += size;
- mem.data = &s[0];
- proto_agent_send_rlc_data_req(&p, 0, 0, 0, 0, 0, size, &mem);
- }
-
- gettimeofday(&t_end, NULL);
- fclose(f);
- long us = uelapsed(&t_start, &t_end);
- fprintf(stderr, "read %zu bytes in %ld ms -> %.3fMB/s, %.3fMbps\n",
- totsize, us / 1000, ((float) totsize ) / us,
- ((float) totsize) / us * 8);
- fprintf(stderr, "check files using 'diff afile bfile'\n");
- /* give some time in case the other direction is slower */
- sleep(5);
- return 0;
-}
-
-/*
- *********************************************************
- * arbitrary functions, needed for linking (used or not) *
- *********************************************************
- */
-
-rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
- const srb_flag_t srb_flagP,
- const MBMS_flag_t MBMS_flagP,
- const rb_id_t rb_idP,
- const mui_t muiP,
- confirm_t confirmP,
- sdu_size_t sdu_sizeP,
- mem_block_t *sdu_pP,
- const uint32_t *const sourceL2Id,
- const uint32_t *const destinationL2Id
- ) {
- fprintf(stderr, "This should never be called on the CU\n");
- exit(1);
-}
-
-pthread_t new_thread(void *(*f)(void *), void *b) {
- pthread_t t;
- pthread_attr_t att;
-
- if (pthread_attr_init(&att)) {
- fprintf(stderr, "pthread_attr_init err\n");
- exit(1);
- }
-
- if (pthread_attr_setdetachstate(&att, PTHREAD_CREATE_DETACHED)) {
- fprintf(stderr, "pthread_attr_setdetachstate err\n");
- exit(1);
- }
-
- if (pthread_create(&t, &att, f, b)) {
- fprintf(stderr, "pthread_create err\n");
- exit(1);
- }
-
- if (pthread_attr_destroy(&att)) {
- fprintf(stderr, "pthread_attr_destroy err\n");
- exit(1);
- }
-
- return t;
-}
-
-int log_header(char *log_buffer, int buffsize, int comp, int level,const char *format) {
- return 0;
-}
-
-int config_get(paramdef_t *params,int numparams, char *prefix) {
- return 0;
-}
-
-int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix) {
- return 0;
-}
diff --git a/openair2/LAYER2/PROTO_AGENT/du_test.c b/openair2/LAYER2/PROTO_AGENT/du_test.c
deleted file mode 100644
index ee622984387d17eae2159680592d38649049dc66..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PROTO_AGENT/du_test.c
+++ /dev/null
@@ -1,163 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/time.h>
-
-#include "ENB_APP/enb_paramdef.h"
-#include "LAYER2/PROTO_AGENT/proto_agent.h"
-
-#define BUF_MAX 1400
-
-void usage(char *prg_name) {
- fprintf(stderr, "usage: %s <file or ->\n", prg_name);
- fprintf(stderr, " - is stdin\n");
- fprintf(stderr, " received packets are written to stdout\n");
-}
-
-long uelapsed(struct timeval *s, struct timeval *e) {
- return e->tv_sec * 1000000 + e->tv_usec - (s->tv_sec * 1000000 + s->tv_usec);
-}
-
-
-rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
- const srb_flag_t srb_flagP,
- const MBMS_flag_t MBMS_flagP,
- const rb_id_t rb_idP,
- const mui_t muiP,
- confirm_t confirmP,
- sdu_size_t sdu_sizeP,
- mem_block_t *sdu_pP,
- const uint32_t *const sourceL2Id,
- const uint32_t *const destinationL2Id
- ) {
- fwrite(sdu_pP->data, sdu_sizeP, 1, stdout);
- fflush(stdout);
- free_mem_block(sdu_pP, __func__);
- //free(ctxt_pP);
- return 0;
-}
-
-void close_proto_agent(void) {
- proto_agent_stop(0);
-}
-
-int main(int argc, char *argv[]) {
- const cudu_params_t params = {
- .local_ipv4_address = "192.168.12.45",
- .local_port = 6465,
- .remote_ipv4_address = "192.168.12.45",
- .remote_port = 6464
- };
- protocol_ctxt_t p;
- memset(&p, 0, sizeof p);
- mem_block_t mem;
- char s[BUF_MAX];
- size_t size, totsize = 0;
- struct timeval t_start, t_end;
- FILE *f;
-
- if (argc != 2) {
- usage(argv[0]);
- return 1;
- }
-
- if (strcmp(argv[1], "-") == 0) {
- f = stdin;
- } else {
- f = fopen(argv[1], "r");
- }
-
- if (!f) {
- fprintf(stderr, "cannot open %s: %s\n", argv[1], strerror(errno));
- return 2;
- }
-
- pool_buffer_init();
-
- if (proto_agent_start(0, ¶ms) != 0) {
- fprintf(stderr, "error on proto_agent_start()\n");
- fclose(f);
- return 3;
- }
-
- atexit(close_proto_agent);
- gettimeofday(&t_start, NULL);
-
- while ((size = fread(s, 1, BUF_MAX, f)) > 0) {
- usleep(10);
- totsize += size;
- mem.data = &s[0];
- proto_agent_send_pdcp_data_ind(&p, 0, 0, 0, size, &mem);
- }
-
- gettimeofday(&t_end, NULL);
- fclose(f);
- long us = uelapsed(&t_start, &t_end);
- fprintf(stderr, "read %zu bytes in %ld ms -> %.3fMB/s, %.3fMbps\n",
- totsize, us / 1000, ((float) totsize ) / us,
- ((float) totsize) / us * 8);
- fprintf(stderr, "check files using 'diff afile bfile'\n");
- /* wait, we are possibly receiving data */
- sleep(5);
- return 0;
-}
-
-/*
- *********************************************************
- * arbitrary functions, needed for linking (used or not) *
- *********************************************************
- */
-
-boolean_t
-pdcp_data_ind(
- const protocol_ctxt_t *const ctxt_pP,
- const srb_flag_t srb_flagP,
- const MBMS_flag_t MBMS_flagP,
- const rb_id_t rb_idP,
- const sdu_size_t sdu_buffer_sizeP,
- mem_block_t *const sdu_buffer_pP
-) {
- fprintf(stderr, "This should never be called on the DU\n");
- exit(1);
-}
-
-pthread_t new_thread(void *(*f)(void *), void *b) {
- pthread_t t;
- pthread_attr_t att;
-
- if (pthread_attr_init(&att)) {
- fprintf(stderr, "pthread_attr_init err\n");
- exit(1);
- }
-
- if (pthread_attr_setdetachstate(&att, PTHREAD_CREATE_DETACHED)) {
- fprintf(stderr, "pthread_attr_setdetachstate err\n");
- exit(1);
- }
-
- if (pthread_create(&t, &att, f, b)) {
- fprintf(stderr, "pthread_create err\n");
- exit(1);
- }
-
- if (pthread_attr_destroy(&att)) {
- fprintf(stderr, "pthread_attr_destroy err\n");
- exit(1);
- }
-
- return t;
-}
-
-int log_header(char *log_buffer, int buffsize, int comp, int level,const char *format) {
- return 0;
-}
-
-int config_get(paramdef_t *params,int numparams, char *prefix) {
- return 0;
-}
-
-int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix) {
- return 0;
-}
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent.c b/openair2/LAYER2/PROTO_AGENT/proto_agent.c
deleted file mode 100644
index 5cf71b826db089bb177df20d5d67590582c2c5cc..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file enb_agent.h
- * \brief top level enb agent receive thread and itti task
- * \author Navid Nikaein and Xenofon Foukas
- * \date 2016
- * \version 0.1
- */
-#define _GNU_SOURCE
-#include "proto_agent_common.h"
-#include "common/utils/LOG/log.h"
-#include "proto_agent.h"
-#include "assertions.h"
-#include "proto_agent_net_comm.h"
-#include "proto_agent_async.h"
-#include <common/utils/system.h>
-#include <pthread.h>
-
-#define ENB_AGENT_MAX 9
-
-proto_agent_instance_t proto_agent[MAX_DU];
-
-//pthread_t new_thread(void *(*f)(void *), void *b);
-
-Protocol__FlexsplitMessage *proto_agent_timeout_fsp(void *args);
-
-#define TEST_MOD 0
-
-#define ECHO
-
-/* Server side function; upon a new connection
- reception, sends the hello packets
-*/
-int proto_agent_start(mod_id_t mod_id, const cudu_params_t *p) {
- int channel_id;
- // RS: CUDU does not work!
- //DevAssert(p->local_interface);
- //DevAssert(p->local_ipv4_address);
- //DevAssert(p->local_port > 1024); // "unprivileged" port
- //DevAssert(p->remote_ipv4_address);
- //DevAssert(p->remote_port > 1024); // "unprivileged" port
- proto_agent[mod_id].mod_id = mod_id;
- proto_agent[mod_id].exit = 0;
- /* Initialize the channel container */
- /* TODO only initialize the first time */
- proto_agent_init_channel_container();
- /*Create the async channel info*/
- proto_agent_async_channel_t *channel_info;
- channel_info = proto_agent_async_channel_info(mod_id, p->local_ipv4_address, p->local_port,
- p->remote_ipv4_address, p->remote_port);
-
- if (!channel_info) goto error;
-
- /* Create a channel using the async channel info */
- channel_id = proto_agent_create_channel((void *) channel_info,
- proto_agent_async_msg_send,
- proto_agent_async_msg_recv,
- proto_agent_async_release);
-
- if (channel_id <= 0) goto error;
-
- proto_agent_channel_t *channel = proto_agent_get_channel(channel_id);
-
- if (!channel) goto error;
-
- proto_agent[mod_id].channel = channel;
- /* Register the channel for all underlying agents (use ENB_AGENT_MAX) */
- proto_agent_register_channel(mod_id, channel, ENB_AGENT_MAX);
- // Code for sending the HELLO/ECHO_REQ message once a connection is established
- //uint8_t *msg = NULL;
- //Protocol__FlexsplitMessage *init_msg=NULL;
- //if (udp == 0)
- //{
- // // If the comm is not UDP, allow the server to send the first packet over the channel
- // //printf( "Proto agent Server: Calling the echo_request packet constructor\n");
- // msg_flag = proto_agent_echo_request(mod_id, NULL, &init_msg);
- // if (msg_flag != 0)
- // goto error;
- //
- // int msgsize = 0;
- // if (init_msg != NULL)
- // msg = proto_agent_pack_message(init_msg, &msgsize);
- // if (msg!= NULL)
- // {
- // LOG_D(PROTO_AGENT, "Server sending the message over the async channel\n");
- // proto_agent_async_msg_send((void *)msg, (int) msgsize, 1, (void *) channel_info);
- // }
- // /* After sending the message, wait for any replies;
- // the server thread blocks until it reads any data
- // over the channel
- // */
- //}
- //proto_agent[mod_id].recv_thread = new_thread(proto_agent_receive, &proto_agent[mod_id]);
- threadCreate(&proto_agent[mod_id].recv_thread, proto_agent_receive, &proto_agent[mod_id], "proto", -1, OAI_PRIORITY_RT_LOW);
- fprintf(stderr, "[PROTO_AGENT] server started at port %s:%d\n", p->local_ipv4_address, p->local_port);
- return 0;
-error:
- LOG_E(PROTO_AGENT, "there was an error\n");
- return 1;
-}
-
-void proto_agent_stop(mod_id_t mod_id) {
- if (!proto_agent[mod_id].channel) return;
-
- /* unlock the independent read thread proto_agent_receive() */
- proto_agent[mod_id].exit = 1;
- proto_agent_async_msg_recv_unlock(proto_agent[mod_id].channel->channel_info);
- proto_agent_async_release(proto_agent[mod_id].channel);
- proto_agent_destroy_channel(proto_agent[mod_id].channel->channel_id);
- free(proto_agent[mod_id].channel);
- proto_agent[mod_id].channel = NULL;
- LOG_W(PROTO_AGENT, "server stopped\n");
-}
-
-//void
-//proto_agent_send_hello(void)
-//{
-// uint8_t *msg = NULL;
-// Protocol__FlexsplitMessage *init_msg=NULL;
-// int msg_flag = 0;
-//
-//
-// //printf( "PDCP agent: Calling the HELLO packet constructor\n");
-// msg_flag = proto_agent_hello(proto_agent[TEST_MOD].mod_id, NULL, &init_msg);
-//
-// int msgsize = 0;
-// if (msg_flag == 0)
-// {
-// proto_agent_serialize_message(init_msg, &msg, &msgsize);
-// }
-//
-// LOG_D(PROTO_AGENT, "Agent sending the message over the async channel\n");
-// proto_agent_async_msg_send((void *)msg, (int) msgsize, 1, (void *) client_channel[TEST_MOD]);
-//}
-
-
-
-rlc_op_status_t proto_agent_send_rlc_data_req(const protocol_ctxt_t *const ctxt_pP,
- const srb_flag_t srb_flagP, const MBMS_flag_t MBMS_flagP,
- const rb_id_t rb_idP, const mui_t muiP,
- confirm_t confirmP, sdu_size_t sdu_sizeP, mem_block_t *sdu_pP,const uint32_t *const SrcID, const uint32_t *const DstID) {
- uint8_t *msg = NULL;
- Protocol__FlexsplitMessage *init_msg=NULL;
- int msg_flag = 0;
- int msgsize = 0;
- mod_id_t mod_id = ctxt_pP->module_id;
- data_req_args args;
- DevAssert(proto_agent[mod_id].channel);
- DevAssert(proto_agent[mod_id].channel->channel_info);
- args.ctxt = ctxt_pP;
- args.srb_flag = srb_flagP;
- args.MBMS_flag = MBMS_flagP;
- args.rb_id = rb_idP;
- args.mui = muiP;
- args.confirm = confirmP;
- args.sdu_size = sdu_sizeP;
- args.sdu_p = sdu_pP;
- msg_flag = proto_agent_pdcp_data_req(mod_id, (void *) &args, &init_msg);
-
- if (msg_flag != 0 || !init_msg) goto error;
-
- msg = proto_agent_pack_message(init_msg, &msgsize);
-
- if (!msg) goto error;
-
- proto_agent_async_msg_send((void *)msg, (int) msgsize, 1, proto_agent[mod_id].channel->channel_info);
- free_mem_block(sdu_pP, __func__);
- return RLC_OP_STATUS_OK;
-error:
- LOG_E(PROTO_AGENT, "PROTO_AGENT there was an error\n");
- return RLC_OP_STATUS_INTERNAL_ERROR;
-}
-
-
-boolean_t proto_agent_send_pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP, const srb_flag_t srb_flagP,
- const MBMS_flag_t MBMS_flagP, const rb_id_t rb_idP,
- sdu_size_t sdu_sizeP, mem_block_t *sdu_pP,
- const uint32_t *const SrcID, const uint32_t *const DstID) {
- uint8_t *msg = NULL;
- Protocol__FlexsplitMessage *init_msg = NULL;
- int msg_flag = 0;
- int msgsize = 0;
- mod_id_t mod_id = ctxt_pP->module_id;
- data_req_args args;
- DevAssert(proto_agent[mod_id].channel);
- DevAssert(proto_agent[mod_id].channel->channel_info);
- args.ctxt = ctxt_pP;
- args.srb_flag = srb_flagP;
- args.MBMS_flag = MBMS_flagP;
- args.rb_id = rb_idP;
- args.sdu_size = sdu_sizeP;
- args.sdu_p = sdu_pP;
- msg_flag = proto_agent_pdcp_data_ind(mod_id, (void *) &args, &init_msg);
-
- if (msg_flag != 0 || !init_msg) goto error;
-
- msg = proto_agent_pack_message(init_msg, &msgsize);
-
- if (!msg) goto error;
-
- proto_agent_async_msg_send((void *)msg, (int) msgsize, 1, proto_agent[mod_id].channel->channel_info);
- free_mem_block(sdu_pP, __func__);
- return TRUE;
-error:
- LOG_E(PROTO_AGENT, "there was an error in %s\n", __func__);
- return FALSE;
-}
-
-void *
-proto_agent_receive(void *args) {
- proto_agent_instance_t *inst = args;
- void *data = NULL;
- int size;
- int priority;
- err_code_t err_code;
- pthread_setname_np(pthread_self(), "proto_rx");
- Protocol__FlexsplitMessage *msg;
- uint8_t *ser_msg;
-
- while (1) {
- msg = NULL;
- ser_msg = NULL;
-
- if ((size = proto_agent_async_msg_recv(&data, &priority, inst->channel->channel_info)) < 0) {
- err_code = PROTOCOL__FLEXSPLIT_ERR__MSG_ENQUEUING;
- goto error;
- }
-
- if (inst->exit) break;
-
- LOG_D(PROTO_AGENT, "Server side Received message with size %d and priority %d, calling message handle\n", size, priority);
- msg = proto_agent_handle_message(inst->mod_id, data, size);
-
- if (!msg) {
- LOG_D(PROTO_AGENT, "msg to send back is NULL\n");
- continue;
- }
-
- ser_msg = proto_agent_pack_message(msg, &size);
-
- if (!ser_msg) {
- continue;
- }
-
- LOG_D(PROTO_AGENT, "Server sending the reply message over the async channel\n");
-
- if (proto_agent_async_msg_send((void *)ser_msg, (int) size, 1, inst->channel->channel_info)) {
- err_code = PROTOCOL__FLEXSPLIT_ERR__MSG_ENQUEUING;
- goto error;
- }
-
- LOG_D(PROTO_AGENT, "sent message with size %d\n", size);
- }
-
- return NULL;
-error:
- LOG_E(PROTO_AGENT, "proto_agent_receive(): error %d occured\n",err_code);
- return NULL;
-}
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent.h b/openair2/LAYER2/PROTO_AGENT/proto_agent.h
deleted file mode 100644
index 4badda43b7953ba80be008b02e1cfc39320c25e1..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file proto_agent.h
- * \brief top level protocol agent
- * \author Navid Nikaein and Xenofon Foukas
- * \date 2016
- * \version 0.1
- */
-
-#ifndef PROTO_AGENT_H_
-#define PROTO_AGENT_H_
-#include "ENB_APP/enb_config.h" // for enb properties
-#include "proto_agent_common.h"
-#include "LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
-#include "RRC/NR/nr_rrc_defs.h"
-
-
-void *proto_agent_receive(void *args);
-
-int proto_agent_start(mod_id_t mod_id, const cudu_params_t *p);
-void proto_agent_stop(mod_id_t mod_id);
-
-rlc_op_status_t proto_agent_send_rlc_data_req( const protocol_ctxt_t *const ctxt_pP,
- const srb_flag_t srb_flagP, const MBMS_flag_t MBMS_flagP,
- const rb_id_t rb_idP, const mui_t muiP, confirm_t confirmP,
- sdu_size_t sdu_sizeP, mem_block_t *sdu_pP,const uint32_t *const SrcID, const uint32_t *const DstID);
-
-pdcp_data_ind_t proto_agent_send_pdcp_data_ind;
-
-#endif
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_async.c b/openair2/LAYER2/PROTO_AGENT/proto_agent_async.c
deleted file mode 100644
index df3684ee275ab035f285132dccb3cc4d13e4a56d..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_async.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-#include "proto_agent_async.h"
-#include "proto_agent_defs.h"
-
-
-#include "common/utils/LOG/log.h"
-
-proto_agent_async_channel_t *
-proto_agent_async_channel_info(mod_id_t mod_id, const char *bind_ip, uint16_t bind_port,
- const char* peer_ip, uint16_t peer_port)
-{
- proto_agent_async_channel_t *channel;
- channel = malloc(sizeof(proto_agent_async_channel_t));
-
- if (channel == NULL)
- goto error;
-
- channel->enb_id = mod_id;
- channel->link = new_link_udp_server(bind_ip, bind_port);
-
- if (channel->link == NULL) goto error;
-
- channel->send_queue = new_message_queue();
- if (channel->send_queue == NULL) goto error;
- channel->receive_queue = new_message_queue();
- if (channel->receive_queue == NULL) goto error;
-
- channel->manager = create_link_manager(channel->send_queue,
- channel->receive_queue,
- channel->link);
- /* manually set remote IP&port for UDP server remote end */
- channel->manager->peer_port = peer_port;
- channel->manager->peer_addr = peer_ip;
-
- if (channel->manager == NULL) goto error;
-
- return channel;
-
- error:
- if (channel)
- free(channel);
- LOG_E(PROTO_AGENT, "error creating proto_agent_async_channel_t\n");
- return NULL;
-}
-
-int proto_agent_async_msg_send(void *data, int size, int priority, void *channel_info)
-{
- proto_agent_async_channel_t *channel = channel_info;
- return message_put(channel->send_queue, data, size, priority);
-}
-
-int proto_agent_async_msg_recv(void **data, int *priority, void *channel_info)
-{
- proto_agent_async_channel_t *channel = channel_info;
- return message_get(channel->receive_queue, data, priority);
-}
-
-void proto_agent_async_msg_recv_unlock(proto_agent_async_channel_t *channel) {
- message_get_unlock(channel->receive_queue);
-}
-
-void proto_agent_async_release(proto_agent_channel_t *channel)
-{
- proto_agent_async_channel_t *channel_info = channel->channel_info;
-
- destroy_link_manager(channel_info->manager);
-
- destroy_message_queue(channel_info->send_queue);
- destroy_message_queue(channel_info->receive_queue);
-
- close_link(channel_info->link);
- free(channel_info);
-}
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_async.h b/openair2/LAYER2/PROTO_AGENT/proto_agent_async.h
deleted file mode 100644
index 6bc952e804de80a7aa42b1b6393776b80fbdd522..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_async.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file enb_agent_async.h
- * \brief channel implementation for async interface
- * \author Xenofon Foukas
- * \date 2016
- * \version 0.1
- */
-
-#ifndef PROTO_AGENT_ASYNC_H_
-#define PROTO_AGENT_ASYNC_H_
-
-#include "proto_agent_net_comm.h"
-
-typedef struct proto_agent_async_channel_s {
- mod_id_t enb_id;
- socket_link_t *link;
- message_queue_t *send_queue;
- message_queue_t *receive_queue;
- link_manager_t *manager;
-} proto_agent_async_channel_t;
-
-proto_agent_async_channel_t *
-proto_agent_async_channel_info(mod_id_t mod_id, const char *bind_ip, uint16_t bind_port,
- const char *peer_ip, uint16_t peer_port);
-
-int proto_agent_async_msg_send(void *data, int size, int priority, void *channel_info);
-
-int proto_agent_async_msg_recv(void **data, int *priority, void *channel_info);
-
-/* unlocks a running proto_agent_async_msg_recv() */
-void proto_agent_async_msg_recv_unlock(proto_agent_async_channel_t *channel);
-
-void proto_agent_async_release(proto_agent_channel_t *channel);
-
-
-#endif /*PROTO_AGENT_ASYNC_H_*/
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_common.c b/openair2/LAYER2/PROTO_AGENT/proto_agent_common.c
deleted file mode 100644
index d3d00d1adaa0abf95b17603a9d19f30704acb0b4..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_common.c
+++ /dev/null
@@ -1,719 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file proto_agent_common.c
- * \brief common primitives for all agents
- * \author Navid Nikaein and Xenofon Foukas
- * \date 2016
- * \version 0.1
- */
-
-#include<stdio.h>
-#include <dlfcn.h>
-#include <time.h>
-
-#include "PHY/phy_extern.h"
-#include "proto_agent_common.h"
-#include "common/utils/LOG/log.h"
-#include "common/ran_context.h"
-
-extern RAN_CONTEXT_t RC;
-
-/*
- * message primitives
- */
-
-// Function to fill in the dl_data header (32bits) with the appropriate fields (doing bitwise operations)
-void fill_dl_data_header(int pdu_type, int spare, int seq_no, uint32_t *header) {
- uint32_t type = pdu_type;
- uint32_t spare_ = spare;
- uint32_t seq = seq_no;
- type = type << 28;
- spare_ = spare_ << 24;
- *header = (type | spare_);
- *header = (*header | seq);
- return;
-}
-
-
-// Function to retrieve data from the dl_data header (32bits) (doing bitwise operations)
-void read_dl_data_header(int *pdu_type, int *spare, int *seqno, uint32_t header) {
- *pdu_type = header;
- *spare = header;
- *seqno = header;
- *pdu_type = *pdu_type >> 28;
- *spare = *spare << 4;
- *spare = *spare >> 28;
- *seqno = *seqno << 8;
- *seqno = *seqno >> 8;
- return;
-}
-
-int f1u_serialize_message(Protocol__F1uMessage *msg, void **buf,int *size) {
- *size = protocol__f1u_message__get_packed_size(msg);
- *buf = malloc(*size);
-
- if (!(*buf))
- goto error;
-
- protocol__f1u_message__pack(msg, *buf);
- return 0;
-error:
- LOG_E(F1U, "an error occured\n");
- return -1;
-}
-
-int f1u_deserialize_message(void *data, int size, Protocol__F1uMessage **msg) {
- *msg = protocol__f1u_message__unpack(NULL, size, data);
-
- if (*msg == NULL)
- goto error;
-
- return 0;
-error:
- LOG_E(F1U, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int f1u_dl_data_create_header(uint32_t pdu_type, uint32_t f1u_sn, Protocol__DlDataHeader **header) {
- *header = malloc(sizeof(Protocol__DlDataHeader));
-
- if(*header == NULL)
- goto error;
-
- protocol__dl_data_header__init(*header);
- LOG_D(F1U, "Initialized the DL Data User header\n");
- fill_dl_data_header(pdu_type, 0, f1u_sn, &(*header)->fields);
- return 0;
-error:
- LOG_E(F1U, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int f1u_dl_data(const void *params, Protocol__F1uMessage **msg) {
- // Initialize the PDCP params
- dl_data_args *args = (dl_data_args *)params;
- Protocol__DlDataHeader *header;
-
- if (f1u_dl_data_create_header(args->pdu_type, args->sn, &header) != 0)
- goto error;
-
- Protocol__DlUserData *dl_data = NULL;
- *msg = malloc(sizeof(Protocol__DlUserData));
-
- if(*msg == NULL)
- goto error;
-
- // FIXME: Is the following used? It seems to be overwritten by the function
- // protocol__dl_user_data__init() anyway
- //dl_data = *msg;
- protocol__dl_user_data__init(dl_data);
- // Copy data to the bytes structure
- dl_data->pdu.data = malloc(args->sdu_size);
- dl_data->pdu.len = args->sdu_size;
- memcpy(dl_data->pdu.data, args->sdu_p, args->sdu_size);
- dl_data->frame = args->frame;
- dl_data->subframe = args->subframe;
- dl_data->rnti = args->rnti;
- dl_data->header = header;
- return 0;
-error:
-
- if(header != NULL)
- free(header);
-
- if(*msg != NULL)
- free(*msg);
-
- LOG_E(F1U, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int proto_agent_serialize_message(Protocol__FlexsplitMessage *msg, uint8_t **buf, int *size) {
- *size = protocol__flexsplit_message__get_packed_size(msg);
- *buf = malloc(*size);
-
- if (!(*buf))
- goto error;
-
- protocol__flexsplit_message__pack(msg, *buf);
- return 0;
-error:
- LOG_E(MAC, "an error occured\n");
- return -1;
-}
-
-/* We assume that the buffer size is equal to the message size.
- Should be chekced durint Tx/Rx */
-int proto_agent_deserialize_message(void *data, int size, Protocol__FlexsplitMessage **msg) {
- *msg = protocol__flexsplit_message__unpack(NULL, size, data);
-
- if (*msg == NULL)
- goto error;
-
- return 0;
-error:
- LOG_E(MAC, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int fsp_create_header(xid_t xid, Protocol__FspType type, Protocol__FspHeader **header) {
- *header = malloc(sizeof(Protocol__FspHeader));
-
- if(*header == NULL)
- goto error;
-
- protocol__fsp_header__init(*header);
- LOG_D(PROTO_AGENT, "Initialized the PROTOBUF message header\n");
- (*header)->version = FLEXSPLIT_VERSION;
- LOG_D(PROTO_AGENT, "Set the vversion to FLEXSPLIT_VERSION\n");
- (*header)->has_version = 1;
- (*header)->type = type;
- (*header)->has_type = 1;
- (*header)->xid = xid;
- (*header)->has_xid = 1;
- return 0;
-error:
- LOG_E(MAC, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int just_print(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg) {
- return 1;
-}
-
-int proto_agent_pdcp_data_req(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg) {
- Protocol__FspCtxt *ctxt = NULL;
- Protocol__FspRlcPdu *pdu = NULL;
- Protocol__FspRlcData *rlc_data = NULL;
- Protocol__FspRlcDataReq *data_req = NULL;
- // Initialize the PDCP params
- data_req_args *args = (data_req_args *)params;
- // Create the protobuf header
- Protocol__FspHeader *header;
- xid_t xid = mod_id;
- LOG_D(PROTO_AGENT, "creating the data_req message\n");
-
- if (fsp_create_header(xid, PROTOCOL__FSP_TYPE__FSPT_RLC_DATA_REQ, &header) != 0)
- goto error;
-
- /* Begin constructing the messages. They are defined as follows:
- * 1) fspRlcPdu is storing the bytes of the packet
- * 2) Message fspRlcData is packing the packet + the context of the PDCP (separate message)
- * 3) Messge fspRlcDataReq is packing the header, enb_id and fspRlcData
- */
- ctxt = malloc(sizeof(Protocol__FspCtxt));
- pdu = malloc(sizeof(Protocol__FspRlcPdu));
- rlc_data = malloc(sizeof(Protocol__FspRlcData));
- data_req = malloc(sizeof(Protocol__FspRlcDataReq));
- protocol__fsp_ctxt__init(ctxt);
- protocol__fsp_rlc_pdu__init(pdu);
- protocol__fsp_rlc_data__init(rlc_data);
- protocol__fsp_rlc_data_req__init(data_req);
- // Copy data to the RlcPdu structure
- pdu->fsp_pdu_data.data = malloc(args->sdu_size);
- pdu->fsp_pdu_data.len = args->sdu_size;
- memcpy(pdu->fsp_pdu_data.data, args->sdu_p->data, args->sdu_size);
- pdu->has_fsp_pdu_data = 1;
- // Copy data to the ctxt structure
- ctxt->fsp_mod_id = args->ctxt->module_id;
- ctxt->fsp_enb_flag = args->ctxt->enb_flag;
- ctxt->fsp_instance = args->ctxt->instance;
- ctxt->fsp_rnti = args->ctxt->rnti;
- ctxt->fsp_frame = args->ctxt->frame;
- ctxt->fsp_subframe = args->ctxt->subframe;
- ctxt->fsp_enb_index = args->ctxt->eNB_index;
- ctxt->has_fsp_mod_id = 1;
- ctxt->has_fsp_enb_flag = 1;
- ctxt->has_fsp_instance = 1;
- ctxt->has_fsp_rnti = 1;
- ctxt->has_fsp_frame = 1;
- ctxt->has_fsp_subframe = 1;
- ctxt->has_fsp_enb_index = 1;
- rlc_data->fsp_ctxt = ctxt;
- rlc_data->fsp_srb_flag = args->srb_flag;
- rlc_data->fsp_mbms_flag = args->MBMS_flag;
- rlc_data->fsp_rb_id = args->rb_id;
- rlc_data->fsp_muip = args->mui;
- rlc_data->fsp_confirm = args->confirm;
- rlc_data->fsp_sdu_buffer_size = args->sdu_size;
- rlc_data->fsp_pdu = pdu;
- rlc_data->has_fsp_srb_flag = 1;
- rlc_data->has_fsp_mbms_flag = 1;
- rlc_data->has_fsp_rb_id = 1;
- rlc_data->has_fsp_muip = 1;
- rlc_data->has_fsp_confirm = 1;
- rlc_data->has_fsp_sdu_buffer_size = 1;
- // Up to here, everything is a signle message that is packed inside another. The final data_req
- // will be created later, after the setting of all variables
- data_req->header = header;
- data_req->enb_id = mod_id;
- data_req->has_enb_id = 1;
- data_req->pdcp_data = rlc_data;
- *msg = malloc(sizeof(Protocol__FlexsplitMessage));
-
- if(*msg == NULL)
- goto error;
-
- protocol__flexsplit_message__init(*msg);
- (*msg)->msg_case = PROTOCOL__FLEXSPLIT_MESSAGE__MSG_DATA_REQ_MSG;
- (*msg)->msg_dir = PROTOCOL__FLEXSPLIT_DIRECTION__INITIATING_MESSAGE; //we will be waiting for the ACK
- (*msg)->has_msg_dir = 1;
- (*msg)->data_req_msg = data_req;
- return 0;
-error:
-
- if(header != NULL)
- free(header);
-
- if(pdu!=NULL)
- free(pdu);
-
- if(rlc_data!=NULL)
- free(rlc_data);
-
- if(data_req!= NULL)
- free(data_req);
-
- if(*msg != NULL)
- free(*msg);
-
- LOG_E(MAC, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int proto_agent_destroy_pdcp_data_req(Protocol__FlexsplitMessage *msg) {
- if(msg->msg_case != PROTOCOL__FLEXSPLIT_MESSAGE__MSG_DATA_REQ_MSG)
- goto error;
-
- free(msg->data_req_msg->header);
- free(msg->data_req_msg->pdcp_data->fsp_pdu->fsp_pdu_data.data);
- free(msg->data_req_msg->pdcp_data->fsp_pdu);
- free(msg->data_req_msg->pdcp_data->fsp_ctxt);
- free(msg->data_req_msg->pdcp_data);
- free(msg->data_req_msg);
- free(msg);
- return 0;
-error:
- LOG_E(MAC, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int proto_agent_get_ack_result(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg) {
-/* code useless in this status: return 0 anyways
- rlc_op_status_t result = 0;
- printf("PROTO_AGENT: handling the data_req_ack message\n");
- Protocol__FlexsplitMessage *input = (Protocol__FlexsplitMessage *)params;
- Protocol__FspRlcDataReqAck *data_ack = input->data_req_ack;
- result = data_ack->result;
- printf("PROTO_AGENT: ACK RESULT IS %u\n", result);
- ack_result = result;
-*/
- return 0;
-}
-
-
-int proto_agent_pdcp_data_req_process(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg) {
- rlc_op_status_t result = 0;
- Protocol__FlexsplitMessage *input = (Protocol__FlexsplitMessage *)params;
- Protocol__FspRlcDataReq *data_req = input->data_req_msg;
- Protocol__FspCtxt *ctxt = NULL;
- Protocol__FspRlcData *rlc_data = NULL;
- rlc_data = data_req->pdcp_data;
- ctxt = rlc_data->fsp_ctxt;
- protocol_ctxt_t ctxt_pP;
- srb_flag_t srb_flagP = 0;
- rb_id_t rb_idP = 0;
- mui_t muiP = 0;
- confirm_t confirmP = 0;
- MBMS_flag_t flag_MBMS = 0;
- sdu_size_t pdcp_pdu_size = 0;
- mem_block_t *pdcp_pdu_p = NULL;
- // Create a new protocol context for handling the packet
- ctxt_pP.module_id = ctxt->fsp_mod_id;
- ctxt_pP.enb_flag = ctxt->fsp_enb_flag;
- ctxt_pP.instance = ctxt->fsp_instance;
- ctxt_pP.rnti = ctxt->fsp_rnti;
- ctxt_pP.frame = ctxt->fsp_frame;
- ctxt_pP.subframe = ctxt->fsp_subframe;
- ctxt_pP.eNB_index = ctxt->fsp_enb_index;
- srb_flagP = rlc_data->fsp_srb_flag;
- flag_MBMS = rlc_data->fsp_mbms_flag;
- rb_idP = rlc_data->fsp_rb_id;
- muiP = rlc_data->fsp_muip;
- confirmP = rlc_data->fsp_confirm;
- pdcp_pdu_size = rlc_data->fsp_pdu->fsp_pdu_data.len;
- pdcp_pdu_p = get_free_mem_block(pdcp_pdu_size, __func__);
-
- if (!pdcp_pdu_p) {
- LOG_E(PROTO_AGENT, "%s: an error occured\n", __FUNCTION__);
- return -1;
- }
-
- memcpy(pdcp_pdu_p->data, rlc_data->fsp_pdu->fsp_pdu_data.data, pdcp_pdu_size);
- if (RC.nrrrc) {
- LOG_D(PROTO_AGENT, "proto_agent received pdcp_data_req \n");
- // for (int i = 0; i < pdcp_pdu_size; i++)
- // printf(" %2.2x", (unsigned char)pdcp_pdu_p->data[i]);
- // printf("\n");
- du_rlc_data_req(&ctxt_pP, srb_flagP, flag_MBMS, rb_idP, muiP, confirmP, pdcp_pdu_size, pdcp_pdu_p);
- result = 1;
- } else {
- result = rlc_data_req(&ctxt_pP, srb_flagP, flag_MBMS, rb_idP, muiP, confirmP, pdcp_pdu_size, pdcp_pdu_p, NULL, NULL);
- }
- return result;
-}
-
-int proto_agent_destroy_pdcp_data_ind(Protocol__FlexsplitMessage *msg) {
- if(msg->msg_case != PROTOCOL__FLEXSPLIT_MESSAGE__MSG_DATA_IND_MSG)
- goto error;
-
- free(msg->data_ind_msg->header);
- free(msg->data_ind_msg->rlc_data->fsp_pdu->fsp_pdu_data.data);
- free(msg->data_ind_msg->rlc_data->fsp_pdu);
- free(msg->data_ind_msg->rlc_data->fsp_ctxt);
- free(msg->data_ind_msg->rlc_data);
- free(msg->data_ind_msg);
- free(msg);
- return 0;
-error:
- LOG_E(MAC, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int proto_agent_pdcp_data_ind(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg) {
- Protocol__FspCtxt *ctxt = NULL;
- Protocol__FspRlcPdu *pdu = NULL;
- Protocol__FspRlcData *rlc_data = NULL;
- Protocol__FspPdcpDataInd *data_ind = NULL;
- // Initialize the PDCP params
- data_req_args *args = (data_req_args *)params;
- // Create the protobuf header
- Protocol__FspHeader *header;
- xid_t xid = mod_id;
- LOG_D(PROTO_AGENT, "creating the data_ind message\n");
-
- if (fsp_create_header(xid, PROTOCOL__FSP_TYPE__FSPT_PDCP_DATA_IND, &header) != 0)
- goto error;
-
- /* Begin constructing the messages. They are defined as follows:
- * 1) fspRlcPdu is storing the bytes of the packet
- * 2) Message fspRlcData is packing the packet + the context of the PDCP (separate message)
- * 3) Messge fspRlcDataReq is packing the header, enb_id and fspRlcData
- */
- ctxt = malloc(sizeof(Protocol__FspCtxt));
- pdu = malloc(sizeof(Protocol__FspRlcPdu));
- rlc_data = malloc(sizeof(Protocol__FspRlcData));
- data_ind = malloc(sizeof(Protocol__FspPdcpDataInd));
- protocol__fsp_ctxt__init(ctxt);
- protocol__fsp_rlc_pdu__init(pdu);
- protocol__fsp_rlc_data__init(rlc_data);
- protocol__fsp_pdcp_data_ind__init(data_ind);
- // Copy data to the RlcPdu structure
- pdu->fsp_pdu_data.data = malloc(args->sdu_size);
- pdu->fsp_pdu_data.len = args->sdu_size;
- memcpy(pdu->fsp_pdu_data.data, args->sdu_p->data, args->sdu_size);
- pdu->has_fsp_pdu_data = 1;
- // Copy data to the ctxt structure
- ctxt->fsp_mod_id = args->ctxt->module_id;
- ctxt->fsp_enb_flag = args->ctxt->enb_flag;
- ctxt->fsp_instance = args->ctxt->instance;
- ctxt->fsp_rnti = args->ctxt->rnti;
- ctxt->fsp_frame = args->ctxt->frame;
- ctxt->fsp_subframe = args->ctxt->subframe;
- ctxt->fsp_enb_index = args->ctxt->eNB_index;
- ctxt->has_fsp_mod_id = 1;
- ctxt->has_fsp_enb_flag = 1;
- ctxt->has_fsp_instance = 1;
- ctxt->has_fsp_rnti = 1;
- ctxt->has_fsp_frame = 1;
- ctxt->has_fsp_subframe = 1;
- ctxt->has_fsp_enb_index = 1;
- rlc_data->fsp_ctxt = ctxt;
- rlc_data->fsp_srb_flag = args->srb_flag;
- rlc_data->fsp_mbms_flag = args->MBMS_flag;
- rlc_data->fsp_rb_id = args->rb_id;
- rlc_data->fsp_sdu_buffer_size = args->sdu_size;
- rlc_data->fsp_pdu = pdu;
- rlc_data->has_fsp_srb_flag = 1;
- rlc_data->has_fsp_mbms_flag = 1;
- rlc_data->has_fsp_rb_id = 1;
- rlc_data->has_fsp_sdu_buffer_size = 1;
- // Up to here, everything is a signle message that is packed inside another. The final data_req
- // will be created later, after the setting of all variables
- data_ind->header = header;
- data_ind->enb_id = mod_id;
- data_ind->has_enb_id = 1;
- data_ind->rlc_data = rlc_data;
- *msg = malloc(sizeof(Protocol__FlexsplitMessage));
-
- if(*msg == NULL)
- goto error;
-
- protocol__flexsplit_message__init(*msg);
- LOG_D(PROTO_AGENT,"setting the message case to %d\n", PROTOCOL__FLEXSPLIT_MESSAGE__MSG_DATA_IND_MSG);
- (*msg)->msg_case = PROTOCOL__FLEXSPLIT_MESSAGE__MSG_DATA_IND_MSG;
- (*msg)->msg_dir = PROTOCOL__FLEXSPLIT_DIRECTION__INITIATING_MESSAGE; //we will be waiting for the ACK
- (*msg)->has_msg_dir = 1;
- (*msg)->data_ind_msg = data_ind; //data_req;
- return 0;
-error:
-
- if(header != NULL)
- free(header);
-
- if(pdu!=NULL)
- free(pdu);
-
- if(rlc_data!=NULL)
- free(rlc_data);
-
- if(data_ind!= NULL)
- free(data_ind);
-
- if(*msg != NULL)
- free(*msg);
-
- LOG_E(MAC, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int proto_agent_pdcp_data_ind_process(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg) {
- boolean_t result = 0;
- Protocol__FlexsplitMessage *input = (Protocol__FlexsplitMessage *)params;
- Protocol__FspPdcpDataInd *data_ind = input->data_ind_msg;
- Protocol__FspCtxt *ctxt = NULL;
- Protocol__FspRlcData *rlc_data = NULL;
- rlc_data = data_ind->rlc_data;
- ctxt = rlc_data->fsp_ctxt;
- protocol_ctxt_t ctxt_pP;
- srb_flag_t srb_flagP = 0;
- rb_id_t rb_idP = 0;
- sdu_size_t pdcp_pdu_size = 0;
- MBMS_flag_t flag_MBMS = 0;
- mem_block_t *pdcp_pdu_p = NULL;
- // Create a new protocol context for handling the packet
- ctxt_pP.module_id = ctxt->fsp_mod_id;
- ctxt_pP.enb_flag = ctxt->fsp_enb_flag;
- ctxt_pP.instance = ctxt->fsp_instance;
- ctxt_pP.rnti = ctxt->fsp_rnti;
- ctxt_pP.frame = ctxt->fsp_frame;
- ctxt_pP.subframe = ctxt->fsp_subframe;
- ctxt_pP.brOption = 0;
- ctxt_pP.eNB_index = ctxt->fsp_enb_index;
- srb_flagP = rlc_data->fsp_srb_flag;
- flag_MBMS = rlc_data->fsp_mbms_flag;
- rb_idP = rlc_data->fsp_rb_id;
- pdcp_pdu_size = rlc_data->fsp_pdu->fsp_pdu_data.len;
- pdcp_pdu_p = get_free_mem_block(pdcp_pdu_size, __func__);
-
- if (!pdcp_pdu_p) goto error;
-
- memcpy(pdcp_pdu_p->data, rlc_data->fsp_pdu->fsp_pdu_data.data, pdcp_pdu_size);
- // if (xid == 1)
- // pdcp_data_ind_wifi((const protocol_ctxt_t*) ctxt_pP, (const srb_flag_t) srb_flagP, (const MBMS_flag_t) flag_MBMS, (const rb_id_t) rb_idP, pdcp_pdu_size, pdcp_pdu_p);
- // else if (xid == 0) // FIXME: USE a preprocessed definition
- LOG_D(PROTO_AGENT, "[inst %ld] Received PDCP PDU with size %d for UE RNTI %x RB %ld, Calling pdcp_data_ind\n", ctxt_pP.instance, pdcp_pdu_size,ctxt_pP.rnti,rb_idP);
- result = pdcp_data_ind(&ctxt_pP,
- srb_flagP,
- flag_MBMS,
- rb_idP,
- pdcp_pdu_size,
- pdcp_pdu_p, NULL, NULL);
- return result;
-error:
-
- if (pdcp_pdu_p)
- free_mem_block(pdcp_pdu_p, __func__);
-
- LOG_E(MAC, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int proto_agent_hello(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg) {
- Protocol__FspHeader *header;
- Protocol__FspHello *hello_msg = NULL;
- /*TODO: Need to set random xid or xid from received hello message*/
- xid_t xid = mod_id;
-
- if (fsp_create_header(xid, PROTOCOL__FSP_TYPE__FSPT_HELLO, &header) != 0)
- goto error;
-
- LOG_D(PROTO_AGENT, "creating the HELLO message\n");
- hello_msg = malloc(sizeof(Protocol__FspHello));
-
- if(hello_msg == NULL)
- goto error;
-
- protocol__fsp_hello__init(hello_msg);
- hello_msg->header = header;
- *msg = malloc(sizeof(Protocol__FlexsplitMessage));
-
- if(*msg == NULL)
- goto error;
-
- protocol__flexsplit_message__init(*msg);
- (*msg)->msg_case = PROTOCOL__FLEXSPLIT_MESSAGE__MSG_HELLO_MSG;
- (*msg)->msg_dir = PROTOCOL__FLEXSPLIT_DIRECTION__SUCCESSFUL_OUTCOME;
- (*msg)->has_msg_dir = 1;
- (*msg)->hello_msg = hello_msg;
- return 0;
-error:
-
- if(header != NULL)
- free(header);
-
- if(hello_msg!=NULL)
- free(hello_msg);
-
- if(*msg != NULL)
- free(*msg);
-
- LOG_E(MAC, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-
-int proto_agent_destroy_hello(Protocol__FlexsplitMessage *msg) {
- if(msg->msg_case != PROTOCOL__FLEXSPLIT_MESSAGE__MSG_HELLO_MSG)
- goto error;
-
- free(msg->hello_msg->header);
- free(msg->hello_msg);
- free(msg);
- return 0;
-error:
- LOG_E(MAC, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int proto_agent_echo_request(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg) {
- Protocol__FspHeader *header;
- Protocol__FspEchoRequest *echo_request_msg = NULL;
- xid_t xid = mod_id;
-
- if (fsp_create_header(xid, PROTOCOL__FSP_TYPE__FSPT_ECHO_REQUEST, &header) != 0)
- goto error;
-
- LOG_D(PROTO_AGENT, "creating the echo request message\n");
- echo_request_msg = malloc(sizeof(Protocol__FspEchoRequest));
-
- if(echo_request_msg == NULL)
- goto error;
-
- protocol__fsp_echo_request__init(echo_request_msg);
- echo_request_msg->header = header;
- *msg = malloc(sizeof(Protocol__FlexsplitMessage));
-
- if(*msg == NULL)
- goto error;
-
- protocol__flexsplit_message__init(*msg);
- LOG_D(PROTO_AGENT,"setting the message direction to %d\n", PROTOCOL__FLEXSPLIT_MESSAGE__MSG_ECHO_REQUEST_MSG);
- (*msg)->msg_case = PROTOCOL__FLEXSPLIT_MESSAGE__MSG_ECHO_REQUEST_MSG;
- (*msg)->msg_dir = PROTOCOL__FLEXSPLIT_DIRECTION__INITIATING_MESSAGE;
- (*msg)->has_msg_dir = 1;
- (*msg)->echo_request_msg = echo_request_msg;
- return 0;
-error:
-
- if(header != NULL)
- free(header);
-
- if(echo_request_msg != NULL)
- free(echo_request_msg);
-
- if(*msg != NULL)
- free(*msg);
-
- return -1;
-}
-
-int proto_agent_destroy_echo_request(Protocol__FlexsplitMessage *msg) {
- if(msg->msg_case != PROTOCOL__FLEXSPLIT_MESSAGE__MSG_ECHO_REQUEST_MSG)
- goto error;
-
- free(msg->echo_request_msg->header);
- free(msg->echo_request_msg);
- free(msg);
- return 0;
-error:
- LOG_E(MAC, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int proto_agent_echo_reply(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg) {
- xid_t xid;
- Protocol__FlexsplitMessage *input = (Protocol__FlexsplitMessage *)params;
- Protocol__FspEchoRequest *echo_req = input->echo_request_msg;
- Protocol__FspEchoReply *echo_reply_msg = NULL;
- xid = (echo_req->header)->xid;
- LOG_D(PROTO_AGENT, "creating the echo reply message\n");
- Protocol__FspHeader *header;
-
- if (fsp_create_header(xid, PROTOCOL__FSP_TYPE__FSPT_ECHO_REPLY, &header) != 0)
- goto error;
-
- echo_reply_msg = malloc(sizeof(Protocol__FspEchoReply));
-
- if(echo_reply_msg == NULL)
- goto error;
-
- protocol__fsp_echo_reply__init(echo_reply_msg);
- echo_reply_msg->header = header;
- *msg = malloc(sizeof(Protocol__FlexsplitMessage));
-
- if(*msg == NULL)
- goto error;
-
- protocol__flexsplit_message__init(*msg);
- (*msg)->msg_case = PROTOCOL__FLEXSPLIT_MESSAGE__MSG_ECHO_REPLY_MSG;
- (*msg)->msg_dir = PROTOCOL__FLEXSPLIT_DIRECTION__SUCCESSFUL_OUTCOME;
- (*msg)->has_msg_dir = 1;
- (*msg)->echo_reply_msg = echo_reply_msg;
- return 0;
-error:
-
- if(header != NULL)
- free(header);
-
- if(echo_reply_msg != NULL)
- free(echo_reply_msg);
-
- if(*msg != NULL)
- free(*msg);
-
- LOG_E(MAC, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
-
-int proto_agent_destroy_echo_reply(Protocol__FlexsplitMessage *msg) {
- if(msg->msg_case != PROTOCOL__FLEXSPLIT_MESSAGE__MSG_ECHO_REPLY_MSG)
- goto error;
-
- free(msg->echo_reply_msg->header);
- free(msg->echo_reply_msg);
- free(msg);
- return 0;
-error:
- LOG_E(MAC, "%s: an error occured\n", __FUNCTION__);
- return -1;
-}
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_common.h b/openair2/LAYER2/PROTO_AGENT/proto_agent_common.h
deleted file mode 100644
index 8f553e05e1db1401358c4fa0dc9dc5d5624b8d42..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_common.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file enb_agent_common.h
- * \brief common message primitves and utilities
- * \author Navid Nikaein and Xenofon Foukas
- * \date 2016
- * \version 0.1
- */
-
-
-
-#ifndef PROTO_AGENT_COMMON_H_
-#define PROTO_AGENT_COMMON_H_
-
-#include <time.h>
-
-#include "flexsplit.pb-c.h"
-
-// Do not need these
-//#include "stats_messages.pb-c.h"
-//#include "stats_common.pb-c.h"
-
-#include "proto_agent_defs.h"
-//#include "ENB_APP/enb_config.h"
-#include "UTIL/MEM/mem_block.h"
-
-//#include "LAYER2/MAC/extern.h"
-//#include "LAYER2/RLC/rlc.h"
-
-# include "tree.h"
-# include "intertask_interface.h"
-
-#define FLEXSPLIT_VERSION 0
-
-typedef int (*proto_agent_message_decoded_callback)(
- mod_id_t mod_id,
- const void *params,
- Protocol__FlexsplitMessage **msg
-);
-
-typedef int (*proto_agent_message_destruction_callback)(
- Protocol__FlexsplitMessage *msg
-);
-
-
-
-/**********************************
- * progRAN protocol messages helper
- * functions and generic handlers
- **********************************/
-
-int proto_agent_serialize_message(Protocol__FlexsplitMessage *msg, uint8_t **buf, int *size);
-int proto_agent_deserialize_message(void *data, int size, Protocol__FlexsplitMessage **msg);
-
-uint8_t *proto_agent_pack_message(Protocol__FlexsplitMessage *msg, int *size);
-
-err_code_t proto_agent_destroy_flexsplit_message(Protocol__FlexsplitMessage *msg);
-
-int fsp_create_header(xid_t xid, Protocol__FspType type, Protocol__FspHeader **header);
-
-int proto_agent_hello(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
-int proto_agent_destroy_hello(Protocol__FlexsplitMessage *msg);
-int proto_agent_echo_request(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
-int proto_agent_destroy_echo_request(Protocol__FlexsplitMessage *msg);
-int proto_agent_echo_reply(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
-int proto_agent_destroy_echo_reply(Protocol__FlexsplitMessage *msg);
-
-int proto_agent_pdcp_data_req(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
-int proto_agent_pdcp_data_req_process(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
-int proto_agent_destroy_pdcp_data_req(Protocol__FlexsplitMessage *msg);
-int proto_agent_pdcp_data_ind(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
-int proto_agent_destroy_pdcp_data_ind(Protocol__FlexsplitMessage *msg);
-int proto_agent_pdcp_data_ind_process(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
-
-int just_print(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
-
-
-int proto_agent_get_ack_result(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
-
-
-Protocol__FlexsplitMessage* proto_agent_handle_message (mod_id_t mod_id,
- uint8_t *data,
- int size);
-
-Protocol__FlexsplitMessage *proto_agent_handle_timed_task(void *args);
-
-typedef struct _data_req_args data_req_args;
-typedef struct _dl_data_args dl_data_args;
-
-struct _data_req_args{
- const protocol_ctxt_t* ctxt;
- srb_flag_t srb_flag;
- MBMS_flag_t MBMS_flag;
- rb_id_t rb_id;
- mui_t mui;
- confirm_t confirm;
- sdu_size_t sdu_size;
- mem_block_t *sdu_p;
-};
-
-struct _dl_data_args{
- uint8_t pdu_type;
- uint32_t sn;
- frame_t frame;
- sub_frame_t subframe;
- rnti_t rnti;
- sdu_size_t sdu_size;
- mem_block_t *sdu_p;
-};
-
-
-#endif
-
-
-
-
-
-
-
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_defs.h b/openair2/LAYER2/PROTO_AGENT/proto_agent_defs.h
deleted file mode 100644
index cd730a6de864f604c979f58021e806f505220c0d..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_defs.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file enb_agent_defs.h
- * \brief enb agent common definitions
- * \author Navid Nikaein and Xenofon Foukas
- * \date 2016
- * \version 0.1
- */
-#ifndef PROTO_AGENT_DEFS_H_
-#define PROTO_AGENT_DEFS_H_
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <string.h>
-
-#include "openairinterface5g_limits.h"
-#include "UTIL/ASYNC_IF/link_manager.h"
-
-#define DEFAULT_PROTO_AGENT_IPv4_ADDRESS "127.0.0.1"
-#define DEFAULT_PROTO_AGENT_PORT 2210
-#define DEFAULT_PROTO_AGENT_CACHE "/mnt/oai_agent_cache"
-
-typedef enum {
-
- PROTO_AGENT_DEFAULT=0,
-
- ENB_AGENT_PHY=1,
- ENB_AGENT_MAC=2,
- ENB_AGENT_RLC=3,
- ENB_AGENT_PDCP=4,
- ENB_AGENT_RRC=5,
- ENB_AGENT_S1AP=6,
- ENB_AGENT_GTP=7,
- ENB_AGENT_X2AP=8,
-
- ENB_AGENT_MAX=9,
-
-} proto_agent_id_t;
-
-/*
-typedef enum {
- ENB_AGENT_ACTION_NONE = 0x0,
-
- ENB_AGENT_ACTION_SEND = 0x1,
-
- ENB_AGENT_ACTION_APPLY = 0x2,
-
- ENB_AGENT_ACTION_CLEAR = 0x4,
-
- ENB_AGENT_ACTION_WRITE = 0x8,
-
- ENB_AGENT_ACTION_FILTER = 0x10,
-
- ENB_AGENT_ACTION_PREPROCESS = 0x20,
-
- ENB_AGENT_ACTION_METER = 0x40,
-
- ENB_AGENT_ACTION_MAX = 0x7f,
-} agent_action_t;
-*/
-/*
-typedef enum {
-
- RAN_LTE_OAI= 0,
-
- RAN_NAME_MAX = 0x7f,
-} ran_name_t;
-*/
-typedef uint8_t xid_t;
-typedef uint8_t mod_id_t; // module or enb id
-typedef uint8_t lcid_t;
-typedef int32_t err_code_t;
-
-typedef struct {
- /* general info */
-
- /* stats */
-
- uint32_t total_rx_msg;
- uint32_t total_tx_msg;
-
- uint32_t rx_msg[NUMBER_OF_eNB_MAX];
- uint32_t tx_msg[NUMBER_OF_eNB_MAX];
-
-} proto_agent_info_t;
-
-/* forward declaration */
-struct proto_agent_channel_s;
-
-typedef struct proto_agent_instance_s {
- mod_id_t mod_id;
- proto_agent_info_t agent_info;
- struct proto_agent_channel_s *channel;
- pthread_t recv_thread;
- uint8_t exit;
-} proto_agent_instance_t;
-
-#endif
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_handler.c b/openair2/LAYER2/PROTO_AGENT/proto_agent_handler.c
deleted file mode 100644
index 82f7849717fae519b81acc0071a6ca7dcf85e62b..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_handler.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file enb_agent_handler.c
- * \brief enb agent tx and rx message handler
- * \author Navid Nikaein and Xenofon Foukas
- * \date 2016
- * \version 0.1
- */
-
-
-#include "proto_agent_common.h"
-#include "common/utils/LOG/log.h"
-#include "assertions.h"
-
-proto_agent_message_decoded_callback proto_agent_messages_callback[][3] = {
- {proto_agent_hello, 0, 0}, /* agent hello */
- {proto_agent_echo_reply, 0, 0}, /* echo */
- {0, just_print, 0}, /* just print */
- {proto_agent_pdcp_data_req_process, proto_agent_pdcp_data_req_process, 0}, /* PDCP data REQ */
- {0, proto_agent_get_ack_result, 0}, /* get ACK result */
- {proto_agent_pdcp_data_ind_process, proto_agent_pdcp_data_ind_process, 0}, /* PDCP data IND */
- {0, just_print, 0}, /* just print */
-};
-
-proto_agent_message_destruction_callback proto_message_destruction_callback[] = {
- proto_agent_destroy_hello,
- proto_agent_destroy_echo_request,
- proto_agent_destroy_echo_reply,
- proto_agent_destroy_pdcp_data_req,
- 0,
- proto_agent_destroy_pdcp_data_ind,
- 0,
-};
-
-//static const char *proto_agent_direction2String[] = {
-// "", /* not_set */
-// "originating message", /* originating message */
-// "successfull outcome", /* successfull outcome */
-// "unsuccessfull outcome", /* unsuccessfull outcome */
-//};
-
-
-Protocol__FlexsplitMessage* proto_agent_handle_message (mod_id_t mod_id,
- uint8_t *data,
- int size){
-
- Protocol__FlexsplitMessage *decoded_message = NULL;
- Protocol__FlexsplitMessage *reply_message = NULL;
- err_code_t err_code;
- DevAssert(data != NULL);
-
- LOG_D(PROTO_AGENT, "Deserializing message with size %u \n", size);
- if (proto_agent_deserialize_message(data, (int) size, &decoded_message) < 0) {
- err_code= PROTOCOL__FLEXSPLIT_ERR__MSG_DECODING;
- goto error;
- }
- /* after deserialization, we don't need the original data memory anymore */
- free(data);
- Protocol__FspHeader *header = (Protocol__FspHeader*) decoded_message;
- if (header->has_type)
- {
- LOG_D(PROTO_AGENT, "Deserialized MSG type is %d and %u\n", decoded_message->msg_case, decoded_message->msg_dir);
- }
-
- if ((decoded_message->msg_case > sizeof(proto_agent_messages_callback) / (3*sizeof(proto_agent_message_decoded_callback))) ||
- (decoded_message->msg_dir > PROTOCOL__FLEXSPLIT_DIRECTION__UNSUCCESSFUL_OUTCOME))
- {
- err_code= PROTOCOL__FLEXSPLIT_ERR__MSG_NOT_HANDLED;
- LOG_D(PROTO_AGENT,"Handling message: MSG NOT handled, going to error\n");
- goto error;
- }
-
-
- err_code = ((*proto_agent_messages_callback[decoded_message->msg_case-1][decoded_message->msg_dir-1])(mod_id, (void *) decoded_message, &reply_message));
-
- if ( err_code < 0 )
- {
- LOG_I(PROTO_AGENT, "decoded_message case : %d, direction : %d \n", decoded_message->msg_case-1, decoded_message->msg_dir-1);
- goto error;
- }
-
- protocol__flexsplit_message__free_unpacked(decoded_message, NULL);
- LOG_D(PROTO_AGENT,"Returning REPLY message after the callback\n");
- return reply_message;
-
- error:
- LOG_E(PROTO_AGENT,"errno %d occured\n",err_code);
- return NULL;
-}
-
-
-
-uint8_t *proto_agent_pack_message(Protocol__FlexsplitMessage *msg, int *size)
-{
- uint8_t *buffer;
- err_code_t err_code = PROTOCOL__FLEXSPLIT_ERR__NO_ERR;
-
- if (proto_agent_serialize_message(msg, &buffer, size) < 0 ) {
- err_code = PROTOCOL__FLEXSPLIT_ERR__MSG_ENCODING;
- goto error;
- }
-
- if (proto_message_destruction_callback[msg->msg_case-1])
- err_code = ((*proto_message_destruction_callback[msg->msg_case-1])(msg));
-
- DevAssert(buffer !=NULL);
-
- LOG_D(PROTO_AGENT,"Serialized the enb mac stats reply (size %d)\n", *size);
- return buffer;
-
- error :
- LOG_E(PROTO_AGENT,"errno %d occured\n",err_code);
-
- return NULL;
-}
-
-err_code_t proto_agent_destroy_flexsplit_message(Protocol__FlexsplitMessage *msg) {
- return ((*proto_message_destruction_callback[msg->msg_case-1])(msg));
-}
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.c b/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.c
deleted file mode 100644
index 925c11c8f81907b4869f681f7d3ffe93fdbed9dc..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file enb_agent_net_comm.c
- * \brief enb agent network interface abstraction
- * \author Xenofon Foukas
- * \date 2016
- * \version 0.1
- */
-
-#include "proto_agent_net_comm.h"
-#include "common/utils/LOG/log.h"
-
-proto_agent_channel_t *proto_channel[NUMBER_OF_eNB_MAX][ENB_AGENT_MAX];
-static proto_agent_channel_instance_t channel_instance;
-int proto_agent_channel_id = 0;
-
-int proto_agent_register_channel(mod_id_t mod_id, proto_agent_channel_t *channel, proto_agent_id_t agent_id) {
- int i;
-
- if (channel == NULL) {
- return -1;
- }
-
- if (agent_id == ENB_AGENT_MAX) {
- for (i = 0; i < ENB_AGENT_MAX; i++) {
- proto_channel[mod_id][i] = channel;
- }
- } else {
- proto_channel[mod_id][agent_id] = channel;
- }
- return 0;
-}
-
-void proto_agent_unregister_channel(mod_id_t mod_id, proto_agent_id_t agent_id) {
- int i;
-
- if (agent_id == ENB_AGENT_MAX) {
- for (i = 0; i < ENB_AGENT_MAX; i++) {
- proto_channel[mod_id][i] = NULL;
- }
- } else {
- proto_channel[mod_id][agent_id] = NULL;
- }
-}
-
-int proto_agent_create_channel(void *channel_info,
- int (*msg_send)(void *data, int size, int priority, void *channel_info),
- int (*msg_recv)(void **data, int *priority, void *channel_info),
- void (*release)(proto_agent_channel_t *channel)) {
-
- int channel_id = ++proto_agent_channel_id;
- proto_agent_channel_t *channel = (proto_agent_channel_t *) malloc(sizeof(proto_agent_channel_t));
- channel->channel_id = channel_id;
- channel->channel_info = channel_info;
- channel->msg_send = msg_send;
- channel->msg_recv = msg_recv;
- channel->release = release;
-
- /*element should be a real pointer*/
- RB_INSERT(proto_agent_channel_map, &channel_instance.proto_agent_head, channel);
-
- LOG_D(PROTO_AGENT, "Created a new channel with id 0x%x\n", channel->channel_id);
-
- return channel_id;
-}
-
-int proto_agent_destroy_channel(int channel_id) {
- int i, j;
-
- /*Check to see if channel exists*/
- struct proto_agent_channel_s *e = NULL;
- struct proto_agent_channel_s search;
- memset(&search, 0, sizeof(struct proto_agent_channel_s));
-
- e = RB_FIND(proto_agent_channel_map, &channel_instance.proto_agent_head, &search);
-
- if (e == NULL) {
- return -1;
- }
-
- /*Unregister the channel from all agents*/
- for (i = 0; i < NUMBER_OF_eNB_MAX; i++) {
- for (j = 0; j < ENB_AGENT_MAX; j++) {
- if (proto_channel[i][j] != NULL) {
- if (proto_channel[i][j]->channel_id == e->channel_id) {
- proto_channel[i][j] = NULL;
- }
- }
- }
- }
-
- /*Remove the channel from the tree and free memory*/
- RB_REMOVE(proto_agent_channel_map, &channel_instance.proto_agent_head, e);
- e->release(e);
- free(e);
-
- return 0;
-}
-
-err_code_t proto_agent_init_channel_container(void) {
- int i, j;
- LOG_D(PROTO_AGENT, "init RB tree for channel container\n");
-
- RB_INIT(&channel_instance.proto_agent_head);
-
- for (i = 0; i < NUMBER_OF_eNB_MAX; i++) {
- for (j = 0; j < ENB_AGENT_MAX; j++) {
- proto_channel[i][j] = NULL;
- }
- }
-
- return 0;
-}
-
-RB_GENERATE(proto_agent_channel_map,proto_agent_channel_s, entry, proto_agent_compare_channel);
-
-int proto_agent_compare_channel(struct proto_agent_channel_s *a, struct proto_agent_channel_s *b) {
- if (a->channel_id < b->channel_id) return -1;
- if (a->channel_id > b->channel_id) return 1;
-
- // equal timers
- return 0;
-}
-
-proto_agent_channel_t * proto_agent_get_channel(int channel_id) {
-
- struct proto_agent_channel_s search;
- memset(&search, 0, sizeof(struct proto_agent_channel_s));
- search.channel_id = channel_id;
-
- return RB_FIND(proto_agent_channel_map, &channel_instance.proto_agent_head, &search);
-
-}
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.h b/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.h
deleted file mode 100644
index 55fca5a928eb4d52fefa4cd6e056e0e80c191ec9..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file enb_agent_net_comm.h
- * \brief enb agent network interface abstraction
- * \autho Xenofon Foukas
- * \date 2016
- * \version 0.1
- */
-#ifndef PROTO_AGENT_NET_COMM_H_
-#define PROTO_AGENT_NET_COMM_H_
-
-#include "proto_agent_defs.h"
-
-#include "tree.h"
-#define ENB_AGENT_MAX 9
-
-/* forward declaration */
-struct proto_agent_async_channel_s;
-
-/*Channel related information used for Tx/Rx of protocol messages*/
-typedef struct proto_agent_channel_s {
- RB_ENTRY(proto_agent_channel_s) entry;
- int channel_id;
- struct proto_agent_async_channel_s *channel_info;
- /*Callbacks for channel message Tx and Rx*/
- int (*msg_send)(void *data, int size, int priority, void *channel_info);
- int (*msg_recv)(void **data, int *priority, void *channel_info);
- void (*release)(struct proto_agent_channel_s *channel);
-} proto_agent_channel_t;
-
-typedef struct proto_agent_channel_instance_s{
- RB_HEAD(proto_agent_channel_map, proto_agent_channel_s) proto_agent_head;
-} proto_agent_channel_instance_t;
-
-
-/*Register a channel to an agent. Use ENB_AGENT_MAX to register the
- *same channel to all agents*/
-int proto_agent_register_channel(mod_id_t mod_id, proto_agent_channel_t *channel, proto_agent_id_t agent_id);
-
-/*Unregister the current channel of an agent. Use ENB_AGENT_MAX to unregister all channels*/
-void proto_agent_unregister_channel(mod_id_t mod_id, proto_agent_id_t agent_id);
-
-/*Create a new channel. Returns the id of the new channel or negative number otherwise*/
-int proto_agent_create_channel(void *channel_info,
- int (*msg_send)(void *data, int size, int priority, void *channel_info),
- int (*msg_recv)(void **data, int *priority, void *channel_info),
- void (*release)(proto_agent_channel_t *channel));
-
-/*Unregister a channel from all agents and destroy it. Returns 0 in case of success*/
-int proto_agent_destroy_channel(int channel_id);
-
-/*Return an agent communication channel based on its id*/
-proto_agent_channel_t * proto_agent_get_channel(int channel_id);
-
-/*Should be called before performing any channel operations*/
-err_code_t proto_agent_init_channel_container(void);
-
-int proto_agent_compare_channel(struct proto_agent_channel_s *a, struct proto_agent_channel_s *b);
-
-/* RB_PROTOTYPE is for .h files */
-RB_PROTOTYPE(proto_agent_channel_map, proto_agent_channel_s, entry, proto_agent_compare_channel);
-
-#endif /*ENB_AGENT_COMM_H_*/
diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
index de947225bbd4e03ed1fa4f32bd8ab384f8d98346..4eb0907046aef6ef7301878a26b24df22ec2a83a 100644
--- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
+++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
@@ -27,7 +27,6 @@
//-----------------------------------------------------------------------------
#include "assertions.h"
-#include "msc.h"
#include "hashtable.h"
#include "rlc_am.h"
#include "rlc_am_segment.h"
@@ -238,17 +237,6 @@ void config_req_rlc_am_asn1 (
(config_am_pP->ul_AM_RLC.t_PollRetransmit<LTE_T_PollRetransmit_spare5) &&
(config_am_pP->dl_AM_RLC.t_Reordering<32) &&
(config_am_pP->dl_AM_RLC.t_StatusProhibit<LTE_T_StatusProhibit_spare2) ) {
- MSC_LOG_RX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RRC_ENB:MSC_RRC_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" CONFIG-REQ t_PollRetx %u t_Reord %u t_StatusPro %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, l_rlc_p),
- PollRetransmit_tab[config_am_pP->ul_AM_RLC.t_PollRetransmit],
- am_t_Reordering_tab[config_am_pP->dl_AM_RLC.t_Reordering],
- t_StatusProhibit_tab[config_am_pP->dl_AM_RLC.t_StatusProhibit]);
LOG_D(RLC, PROTOCOL_RLC_AM_CTXT_FMT" CONFIG_REQ (max_retx_threshold=%d poll_pdu=%d poll_byte=%d t_poll_retransmit=%d t_reord=%d t_status_prohibit=%d)\n",
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,l_rlc_p),
maxRetxThreshold_tab[config_am_pP->ul_AM_RLC.maxRetxThreshold],
@@ -267,14 +255,6 @@ void config_req_rlc_am_asn1 (
am_t_Reordering_tab[config_am_pP->dl_AM_RLC.t_Reordering],
t_StatusProhibit_tab[config_am_pP->dl_AM_RLC.t_StatusProhibit]);
} else {
- MSC_LOG_RX_DISCARDED_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RRC_ENB:MSC_RRC_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" CONFIG-REQ",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, l_rlc_p));
LOG_D(RLC,
PROTOCOL_RLC_AM_CTXT_FMT"ILLEGAL CONFIG_REQ (max_retx_threshold=%ld poll_pdu=%ld poll_byte=%ld t_poll_retransmit=%ld t_reord=%ld t_status_prohibit=%ld), RLC-AM NOT CONFIGURED\n",
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,l_rlc_p),
@@ -537,27 +517,6 @@ rlc_am_mac_status_indication (
}
}
- if (MESSAGE_CHART_GENERATOR) {
- MSC_LOG_RX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_MAC_ENB:MSC_MAC_UE,
- NULL,0,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" STATUS-IND %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, rlc));
- MSC_LOG_TX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_MAC_ENB:MSC_MAC_UE,
- NULL,0,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" STATUS-RESP BO:%u/n%u(%u) %s sdu remain %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, rlc),
- status_resp.buffer_occupancy_in_bytes,
- status_resp.buffer_occupancy_in_pdus,rlc->nb_sdu,
- (status_resp.head_sdu_is_segmented)?"sdu seg":"sdu not seg",
- status_resp.head_sdu_remaining_size_to_send);
- }
-
if (LOG_DEBUGFLAG(DEBUG_RLC)) {
LOG_UI(RLC, PROTOCOL_RLC_AM_CTXT_FMT" MAC_STATUS_INDICATION (DATA) -> %d bytes\n",
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc),
@@ -610,7 +569,7 @@ rlc_am_mac_data_request (
data_req.rlc_info.rlc_protocol_state = l_rlc_p->protocol_state;
- if ( (MESSAGE_CHART_GENERATOR || LOG_DEBUGFLAG(DEBUG_RLC))&& data_req.data.nb_elements > 0) {
+ if ( (LOG_DEBUGFLAG(DEBUG_RLC))&& data_req.data.nb_elements > 0) {
tb_p = data_req.data.head;
while (tb_p != NULL) {
@@ -619,39 +578,6 @@ rlc_am_mac_data_request (
if ((((struct mac_tb_req *) (tb_p->data))->data_ptr[0] & RLC_DC_MASK) == RLC_DC_DATA_PDU ) {
if (rlc_am_get_data_pdu_infos(ctxt_pP,l_rlc_p,rlc_am_pdu_sn_10_p, tb_size_in_bytes, &pdu_info) >= 0) {
- if (MESSAGE_CHART_GENERATOR) {
- message_string_size = 0;
- message_string_size += sprintf(&message_string[message_string_size],
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" DATA SN %u size %u RF %u P %u FI %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, l_rlc_p),
- pdu_info.sn,
- tb_size_in_bytes,
- pdu_info.rf,
- pdu_info.p,
- pdu_info.fi);
-
- if (pdu_info.rf) {
- message_string_size += sprintf(&message_string[message_string_size], " LSF %u\n", pdu_info.lsf);
- message_string_size += sprintf(&message_string[message_string_size], " SO %u\n", pdu_info.so);
- }
-
- if (pdu_info.e) {
- message_string_size += sprintf(&message_string[message_string_size], "| HE:");
-
- for (index=0; index < pdu_info.num_li; index++) {
- message_string_size += sprintf(&message_string[message_string_size], " LI %u", pdu_info.li_list[index]);
- }
- }
-
- MSC_LOG_TX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_UE:MSC_RLC_ENB,
- (char *)rlc_am_pdu_sn_10_p,
- tb_size_in_bytes,
- message_string);
- }
-
if ( LOG_DEBUGFLAG(DEBUG_RLC)) {
message_string_size = 0;
message_string_size += sprintf(&message_string[message_string_size], "Bearer : %ld\n", l_rlc_p->rb_id);
@@ -723,34 +649,6 @@ rlc_am_mac_data_request (
if (rlc_am_get_control_pdu_infos(rlc_am_pdu_sn_10_p, &tb_size_in_bytes, &l_rlc_p->control_pdu_info) >= 0) {
tb_size_in_bytes = ((struct mac_tb_req *) (tb_p->data))->tb_size; //tb_size_in_bytes modified by rlc_am_get_control_pdu_infos!
- if (MESSAGE_CHART_GENERATOR ) {
- message_string_size = 0;
- message_string_size += sprintf(&message_string[message_string_size],
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" STATUS ACK_SN %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, l_rlc_p),
- l_rlc_p->control_pdu_info.ack_sn);
-
- for (num_nack = 0; num_nack < l_rlc_p->control_pdu_info.num_nack; num_nack++) {
- if (l_rlc_p->control_pdu_info.nack_list[num_nack].e2) {
- message_string_size += sprintf(&message_string[message_string_size], " NACK SN %u SO START %u SO END %u",
- l_rlc_p->control_pdu_info.nack_list[num_nack].nack_sn,
- l_rlc_p->control_pdu_info.nack_list[num_nack].so_start,
- l_rlc_p->control_pdu_info.nack_list[num_nack].so_end);
- } else {
- message_string_size += sprintf(&message_string[message_string_size], " NACK SN %u",
- l_rlc_p->control_pdu_info.nack_list[num_nack].nack_sn);
- }
- }
-
- MSC_LOG_TX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_UE:MSC_RLC_ENB,
- (char *)rlc_am_pdu_sn_10_p,
- tb_size_in_bytes,
- message_string);
- }
-
if ( LOG_DEBUGFLAG(DEBUG_RLC)) {
message_string_size = 0;
message_string_size += sprintf(&message_string[message_string_size], "Bearer : %ld\n", l_rlc_p->rb_id);
@@ -780,7 +678,7 @@ rlc_am_mac_data_request (
tb_p = tb_p->next;
} /* while */
- } /* MESSAGE_CHART_GENERATOR && data_req.data.nb_elements > 0 */
+ } /* data_req.data.nb_elements > 0 */
data_req.buffer_occupancy_in_pdus = 0;
return data_req;
@@ -812,7 +710,7 @@ rlc_am_mac_data_indication (
(void)index;
(void)l_rlc_p; /* avoid gcc warning "unused variable" */
- if ( LOG_DEBUGFLAG(DEBUG_RLC) || MESSAGE_CHART_GENERATOR ) {
+ if ( LOG_DEBUGFLAG(DEBUG_RLC)) {
if (data_indP.data.nb_elements > 0) {
tb_p = data_indP.data.head;
@@ -822,39 +720,6 @@ rlc_am_mac_data_indication (
if ((((struct mac_tb_ind *) (tb_p->data))->data_ptr[0] & RLC_DC_MASK) == RLC_DC_DATA_PDU ) {
if (rlc_am_get_data_pdu_infos(ctxt_pP,l_rlc_p,rlc_am_pdu_sn_10_p, tb_size_in_bytes, &pdu_info) >= 0) {
- if (MESSAGE_CHART_GENERATOR) {
- message_string_size = 0;
- message_string_size += sprintf(&message_string[message_string_size],
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" DATA SN %u size %u RF %u P %u FI %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, l_rlc_p),
- pdu_info.sn,
- tb_size_in_bytes,
- pdu_info.rf,
- pdu_info.p,
- pdu_info.fi);
-
- if (pdu_info.rf) {
- message_string_size += sprintf(&message_string[message_string_size], " LSF %u\n", pdu_info.lsf);
- message_string_size += sprintf(&message_string[message_string_size], " SO %u\n", pdu_info.so);
- }
-
- if (pdu_info.e) {
- message_string_size += sprintf(&message_string[message_string_size], "| HE:");
-
- for (index=0; index < pdu_info.num_li; index++) {
- message_string_size += sprintf(&message_string[message_string_size], " LI %u", pdu_info.li_list[index]);
- }
- }
-
- MSC_LOG_RX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_UE:MSC_RLC_ENB,
- (char *)rlc_am_pdu_sn_10_p,
- tb_size_in_bytes,
- message_string);
- }
-
if ( LOG_DEBUGFLAG(DEBUG_RLC)) {
message_string_size += sprintf(&message_string[message_string_size], "Bearer : %ld\n", l_rlc_p->rb_id);
message_string_size += sprintf(&message_string[message_string_size], "PDU size : %u\n", tb_size_in_bytes);
@@ -923,34 +788,6 @@ rlc_am_mac_data_indication (
}
} else {
if (rlc_am_get_control_pdu_infos(rlc_am_pdu_sn_10_p, &tb_size_in_bytes, &l_rlc_p->control_pdu_info) >= 0) {
- if (MESSAGE_CHART_GENERATOR) {
- message_string_size = 0;
- message_string_size += sprintf(&message_string[message_string_size],
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" STATUS size ACK_SN %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, l_rlc_p),
- l_rlc_p->control_pdu_info.ack_sn);
-
- for (num_nack = 0; num_nack < l_rlc_p->control_pdu_info.num_nack; num_nack++) {
- if (l_rlc_p->control_pdu_info.nack_list[num_nack].e2) {
- message_string_size += sprintf(&message_string[message_string_size], " NACK SN %u SO START %u SO END %u",
- l_rlc_p->control_pdu_info.nack_list[num_nack].nack_sn,
- l_rlc_p->control_pdu_info.nack_list[num_nack].so_start,
- l_rlc_p->control_pdu_info.nack_list[num_nack].so_end);
- } else {
- message_string_size += sprintf(&message_string[message_string_size], " NACK SN %u",
- l_rlc_p->control_pdu_info.nack_list[num_nack].nack_sn);
- }
- }
-
- MSC_LOG_RX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_UE:MSC_RLC_ENB,
- (char *)rlc_am_pdu_sn_10_p,
- tb_size_in_bytes,
- message_string);
- }
-
if ( LOG_DEBUGFLAG(DEBUG_RLC)) {
message_string_size = 0;
message_string_size += sprintf(&message_string[message_string_size], "Bearer : %ld\n", l_rlc_p->rb_id);
@@ -1009,16 +846,6 @@ rlc_am_data_req (
mui = ((struct rlc_am_data_req *) (sdu_pP->data))->mui;
data_offset = ((struct rlc_am_data_req *) (sdu_pP->data))->data_offset;
data_size = ((struct rlc_am_data_req *) (sdu_pP->data))->data_size;
- MSC_LOG_RX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- (const char *)(&sdu_pP->data[data_offset]),
- data_size,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" DATA-REQ size %u mui %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, l_rlc_p),
- data_size,
- mui);
if (LOG_DEBUGFLAG(DEBUG_RLC)) {
message_string_size += sprintf(&message_string[message_string_size], "Bearer : %ld\n", l_rlc_p->rb_id);
@@ -1094,22 +921,6 @@ rlc_am_data_req (
l_rlc_p->vt_s);
}
} else {
- if( MESSAGE_CHART_GENERATOR) {
- mui = ((struct rlc_am_data_req *) (sdu_pP->data))->mui;
- data_offset = ((struct rlc_am_data_req *) (sdu_pP->data))->data_offset;
- data_size = ((struct rlc_am_data_req *) (sdu_pP->data))->data_size;
- MSC_LOG_RX_DISCARDED_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- (const char *)(&sdu_pP->data[data_offset]),
- data_size,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" DATA-REQ size %u mui %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, l_rlc_p),
- data_size,
- mui);
- }
-
LOG_W(RLC, PROTOCOL_RLC_AM_CTXT_FMT" RLC_AM_DATA_REQ BUFFER FULL, NB SDU %d current_sdu_index=%d next_sdu_index=%d size_input_sdus_buffer=%d vtA=%d vtS=%d\n",
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,l_rlc_p),
l_rlc_p->nb_sdu,
diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.h b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.h
index 3127f67eca85a575bba23d012267d5acb16f9ed6..b4073303dde992dd941eabc744369bb4a6d4d50b 100644
--- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.h
+++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.h
@@ -78,16 +78,7 @@
int pmtl_rc = pthread_mutex_trylock(mUTEX);\
if (pmtl_rc != 0){\
if (pmtl_rc == EBUSY) {\
- MSC_LOG_EVENT((cTXT->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 " PROTOCOL_RLC_AM_MSC_FMT " Warning try lock %s busy",\
- PROTOCOL_RLC_AM_MSC_ARGS(cTXT,rLC),\
- #mUTEX);\
pthread_mutex_lock(mUTEX);\
- } else {\
- MSC_LOG_EVENT((cTXT->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 " PROTOCOL_RLC_AM_MSC_FMT " Error try lock %s %d",\
- PROTOCOL_RLC_AM_MSC_ARGS(cTXT,rLC),\
- #mUTEX, pmtl_rc);\
}\
}\
} while (0);
diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
index 793d0057ac99a149fb27c1011c23aa27e24f62f5..0957c20bdfc2ba6ae64811edbfcf11fdd3369285 100644
--- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
+++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
@@ -30,7 +30,6 @@
#include "list.h"
//#include "LAYER2/MAC/extern.h"
#include "common/utils/LOG/log.h"
-#include "msc.h"
//-----------------------------------------------------------------------------
inline void
@@ -152,16 +151,6 @@ rlc_am_send_sdu (
#if !ENABLE_ITTI
RLC_AM_MUTEX_UNLOCK(&rlc_pP->lock_input_sdus);
#endif
- MSC_LOG_TX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- (const char *)(rlc_pP->output_sdu_in_construction->data),
- rlc_pP->output_sdu_size_to_write,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" DATA-IND size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP,rlc_pP),
- rlc_pP->output_sdu_size_to_write
- );
rlc_data_ind (ctxt_pP,
BOOL_NOT(rlc_pP->is_data_plane),
MBMS_FLAG_NO,
diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_receiver.c b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_receiver.c
index f9a4affb6b9d187ebefc585ae521a11877491f8f..916d1513b0f1f1f0c65ddac2c9bc64a89eb81169 100644
--- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_receiver.c
+++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_receiver.c
@@ -24,7 +24,6 @@
#include "platform_types.h"
//-----------------------------------------------------------------------------
#include "assertions.h"
-#include "msc.h"
#include "rlc.h"
#include "rlc_am.h"
#include "list.h"
diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_retransmit.c b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_retransmit.c
index 4d34338ea98097d1229d9ee26e79624ff17a951a..56b37e1e3953e1e4bcb6af5514ff111966b06b69 100644
--- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_retransmit.c
+++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_retransmit.c
@@ -28,7 +28,6 @@
#include "rlc.h"
#include "LAYER2/MAC/mac_extern.h"
#include "common/utils/LOG/log.h"
-#include "msc.h"
//-----------------------------------------------------------------------------
boolean_t rlc_am_nack_pdu (
const protocol_ctxt_t* const ctxt_pP,
diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_segment.c b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_segment.c
index dbe55c483da8322bb1e1e76a76faca01630ee795..ed81e119acb2eb4e72a4d53d1373c8d18565ed64 100644
--- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_segment.c
+++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_segment.c
@@ -26,7 +26,6 @@
//-----------------------------------------------------------------------------
#include "platform_types.h"
//-----------------------------------------------------------------------------
-#include "msc.h"
#include "list.h"
#include "rlc_am.h"
#include "LAYER2/MAC/mac_extern.h"
diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_poll_retransmit.c b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_poll_retransmit.c
index e421a36619f0024eebfaeb478800630bb0dcbf3b..969ed2d7a54815a085786c84c4aece717c5e087a 100644
--- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_poll_retransmit.c
+++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_poll_retransmit.c
@@ -29,7 +29,6 @@
#include "rlc_am.h"
#include "LAYER2/MAC/mac_extern.h"
#include "common/utils/LOG/log.h"
-#include "msc.h"
//-----------------------------------------------------------------------------
void
rlc_am_check_timer_poll_retransmit(
@@ -69,11 +68,6 @@ rlc_am_check_timer_poll_retransmit(
rlc_pP->t_poll_retransmit.running = 0;
rlc_pP->t_poll_retransmit.timed_out = 1;
rlc_pP->stat_timer_poll_retransmit_timed_out += 1;
-#if MESSAGE_CHART_GENERATOR_RLC_MAC
- MSC_LOG_EVENT((ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 "PROTOCOL_RLC_AM_MSC_FMT" t_poll_retransmit timed-out",\
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP,rlc_pP));
-#endif
LOG_D(RLC, PROTOCOL_RLC_AM_CTXT_FMT"[T_POLL_RETRANSMIT] TIME-OUT\n",
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP));
@@ -144,11 +138,6 @@ rlc_am_stop_and_reset_timer_poll_retransmit(
rlc_pP->t_poll_retransmit.ms_time_out = 0;
rlc_pP->t_poll_retransmit.ms_start = 0;
rlc_pP->t_poll_retransmit.timed_out = 0;
-#if MESSAGE_CHART_GENERATOR_RLC_MAC
- MSC_LOG_EVENT((ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 "PROTOCOL_RLC_AM_MSC_FMT" t_poll_retransmit stopped & reseted",\
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP,rlc_pP));
-#endif
}
//-----------------------------------------------------------------------------
void
@@ -167,11 +156,6 @@ rlc_am_start_timer_poll_retransmit(
LOG_D(RLC, PROTOCOL_RLC_AM_CTXT_FMT"[T_POLL_RETRANSMIT] STARTED (TIME-OUT = FRAME %05d)\n",
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP),
rlc_pP->t_poll_retransmit.ms_time_out);
-#if MESSAGE_CHART_GENERATOR_RLC_MAC
- MSC_LOG_EVENT((ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 "PROTOCOL_RLC_AM_MSC_FMT" t_poll_retransmit started (TO %u ms)",\
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP,rlc_pP), rlc_pP->t_poll_retransmit.ms_time_out);
-#endif
} else {
LOG_T(RLC, PROTOCOL_RLC_AM_CTXT_FMT"[T_POLL_RETRANSMIT] NOT STARTED, CAUSE CONFIGURED 0 ms\n",
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP));
diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_reordering.c b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_reordering.c
index 262b8a8391fc931511d1770bb17f7616fcbe8858..d161d29a65db23457fad697b41cf400ed3717a3d 100644
--- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_reordering.c
+++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_reordering.c
@@ -28,7 +28,6 @@
#include "rlc_am.h"
# include "LAYER2/MAC/mac_extern.h"
#include "common/utils//LOG/log.h"
-#include "msc.h"
//-----------------------------------------------------------------------------
void
rlc_am_check_timer_reordering(
@@ -64,12 +63,6 @@ rlc_am_check_timer_reordering(
// - start t-Reordering;
// - set VR(X) to VR(H).
-#if MESSAGE_CHART_GENERATOR_RLC_MAC
- MSC_LOG_EVENT((ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 "PROTOCOL_RLC_AM_MSC_FMT" t_reordering timed out",\
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP,rlc_pP));
-#endif
-
//AssertFatal (rlc_pP->vr_x != RLC_SN_UNDEFINED, "RLC AM TReordering Expiry vrX not defined LcId=%d\n", rlc_pP->channel_id);
if(rlc_pP->vr_x == RLC_SN_UNDEFINED){
LOG_E(RLC, "RLC AM TReordering Expiry vrX not defined LcId=%d\n", rlc_pP->channel_id);
@@ -153,11 +146,6 @@ rlc_am_stop_and_reset_timer_reordering(
rlc_pP->t_reordering.ms_time_out = 0;
rlc_pP->t_reordering.ms_start = 0;
rlc_pP->t_reordering.timed_out = 0;
-#if MESSAGE_CHART_GENERATOR_RLC_MAC
- MSC_LOG_EVENT((ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 "PROTOCOL_RLC_AM_MSC_FMT" t_reordering stopped & reseted",\
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP,rlc_pP));
-#endif
}
//-----------------------------------------------------------------------------
void
@@ -175,11 +163,6 @@ rlc_am_start_timer_reordering(
LOG_D(RLC, PROTOCOL_RLC_AM_CTXT_FMT"[T-REORDERING] STARTED (TIME-OUT = %5u ms)\n",
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP),
rlc_pP->t_reordering.ms_time_out);
-#if MESSAGE_CHART_GENERATOR_RLC_MAC
- MSC_LOG_EVENT((ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 "PROTOCOL_RLC_AM_MSC_FMT" t_reordering started (TO %u ms)",\
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP,rlc_pP), rlc_pP->t_reordering.ms_time_out);
-#endif
} else {
LOG_T(RLC, PROTOCOL_RLC_AM_CTXT_FMT"[T-REORDERING] NOT STARTED, CAUSE CONFIGURED 0 ms\n",
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP));
diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_status_prohibit.c b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_status_prohibit.c
index 5b0b0a70faa1ad1f33a0bce0d878f395495fbbbb..aae7465bcf1840f8d22de2d1b20a89b05bb56e5c 100644
--- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_status_prohibit.c
+++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_timer_status_prohibit.c
@@ -28,7 +28,6 @@
#include "rlc_am.h"
#include "LAYER2/MAC/mac_extern.h"
#include "common/utils/LOG/log.h"
-#include "msc.h"
//-----------------------------------------------------------------------------
void
rlc_am_check_timer_status_prohibit(
@@ -60,12 +59,6 @@ rlc_am_check_timer_status_prohibit(
rlc_pP->t_status_prohibit.running = 0;
rlc_pP->t_status_prohibit.timed_out = 1;
rlc_pP->stat_timer_status_prohibit_timed_out += 1;
-
-#if MESSAGE_CHART_GENERATOR_RLC_MAC
- MSC_LOG_EVENT((ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 "PROTOCOL_RLC_AM_MSC_FMT" t_status_prohibit timed out",\
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP,rlc_pP));
-#endif
LOG_D(RLC, PROTOCOL_RLC_AM_CTXT_FMT"[T-STATUS-PROHIBIT] TIME-OUT\n",
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP));
//#warning TO DO rlc_am_check_timer_status_prohibit
@@ -91,11 +84,6 @@ rlc_am_stop_and_reset_timer_status_prohibit(
rlc_pP->t_status_prohibit.ms_time_out = 0;
rlc_pP->t_status_prohibit.ms_start = 0;
rlc_pP->t_status_prohibit.timed_out = 0;
-#if MESSAGE_CHART_GENERATOR_RLC_MAC
- MSC_LOG_EVENT((ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 "PROTOCOL_RLC_AM_MSC_FMT" t_status_prohibit stopped & reseted",\
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP,rlc_pP));
-#endif
}
}
//-----------------------------------------------------------------------------
@@ -117,11 +105,6 @@ rlc_am_start_timer_status_prohibit(
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP),
rlc_pP->t_status_prohibit.ms_time_out);
LOG_D(RLC, "TIME-OUT = FRAME %u\n", rlc_pP->t_status_prohibit.ms_time_out);
-#if MESSAGE_CHART_GENERATOR_RLC_MAC
- MSC_LOG_EVENT((ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 "PROTOCOL_RLC_AM_MSC_FMT" t_status_prohibit started (TO %u ms)",\
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP,rlc_pP), rlc_pP->t_status_prohibit.ms_time_out);
-#endif
} else {
LOG_T(RLC, PROTOCOL_RLC_AM_CTXT_FMT"[T-STATUS-PROHIBIT] NOT STARTED, CAUSE CONFIGURED 0 ms\n",
PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP));
diff --git a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
index 654ddb8da7e5d13c69a53cac2e045f086c8dbe61..1d40b12cc8ebc5c8e88b648560ec84b2f88fdf49 100644
--- a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
+++ b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
@@ -30,7 +30,6 @@
#include "intertask_interface.h"
#endif
#include "assertions.h"
-#include "msc.h"
#include "rlc_um.h"
#include "list.h"
#include "rlc_primitives.h"
@@ -166,7 +165,6 @@ rlc_um_rx (const protocol_ctxt_t *const ctxt_pP, void *argP, struct mac_data_ind
char message_string[10000];
mem_block_t *tb_p;
int16_t tb_size_in_bytes;
- size_t message_string_size = 0;
rlc_um_pdu_info_t pdu_info;
int index;
int octet_index;
@@ -183,38 +181,15 @@ rlc_um_rx (const protocol_ctxt_t *const ctxt_pP, void *argP, struct mac_data_ind
LOG_I(RLC, PROTOCOL_RLC_UM_CTXT_FMT" ERROR MAC_DATA_IND IN RLC_NULL_STATE\n",
PROTOCOL_RLC_UM_CTXT_ARGS(ctxt_pP,l_rlc_p));
- if (data_indP.data.nb_elements > 0 && MESSAGE_CHART_GENERATOR) {
+ if (data_indP.data.nb_elements > 0) {
tb_p = data_indP.data.head;
while (tb_p != NULL) {
tb_size_in_bytes = ((struct mac_tb_ind *) (tb_p->data))->size;
rlc_um_get_pdu_infos(ctxt_pP,l_rlc_p,(rlc_um_pdu_sn_10_t *) ((struct mac_tb_ind *) (tb_p->data))->data_ptr, tb_size_in_bytes, &pdu_info, l_rlc_p->rx_sn_length);
- message_string_size = 0;
- message_string_size += sprintf(&message_string[message_string_size],
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_UM_MSC_FMT"DATA SN %u size %u FI %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_UM_MSC_ARGS(ctxt_pP, l_rlc_p),
- pdu_info.sn,
- tb_size_in_bytes,
- pdu_info.fi);
-
- if (pdu_info.e) {
- message_string_size += sprintf(&message_string[message_string_size], "| HE:");
-
- for (index=0; index < pdu_info.num_li; index++) {
- message_string_size += sprintf(&message_string[message_string_size], " LI %u", pdu_info.li_list[index]);
- }
- }
-
- MSC_LOG_RX_DISCARDED_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_UE:MSC_RLC_ENB,
- (const char *)pdu_info.payload,
- tb_size_in_bytes,
- message_string);
tb_p = tb_p->next;
}
- }/*MESSAGE_CHART_GENERATOR*/
+ }
list_free (&data_indP.data);
break;
@@ -237,7 +212,7 @@ rlc_um_rx (const protocol_ctxt_t *const ctxt_pP, void *argP, struct mac_data_ind
// - enters the LOCAL_SUSPEND state.
data_indP.tb_size = data_indP.tb_size >> 3;
- if (data_indP.data.nb_elements > 0 && (MESSAGE_CHART_GENERATOR || LOG_DEBUGFLAG(DEBUG_RLC))) {
+ if (data_indP.data.nb_elements > 0 && (LOG_DEBUGFLAG(DEBUG_RLC))) {
LOG_D(RLC, PROTOCOL_RLC_UM_CTXT_FMT" MAC_DATA_IND %d TBs\n",
PROTOCOL_RLC_UM_CTXT_ARGS(ctxt_pP,l_rlc_p),
data_indP.data.nb_elements);
@@ -251,32 +226,6 @@ rlc_um_rx (const protocol_ctxt_t *const ctxt_pP, void *argP, struct mac_data_ind
&pdu_info,
l_rlc_p->rx_sn_length);
- if (MESSAGE_CHART_GENERATOR) {
- message_string_size = 0;
- message_string_size += sprintf(&message_string[message_string_size],
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_UM_MSC_FMT"DATA SN %u size %u FI %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_UM_MSC_ARGS(ctxt_pP, l_rlc_p),
- pdu_info.sn,
- tb_size_in_bytes,
- pdu_info.fi);
-
- if (pdu_info.e) {
- message_string_size += sprintf(&message_string[message_string_size], "| HE:");
-
- for (index=0; index < pdu_info.num_li; index++) {
- message_string_size += sprintf(&message_string[message_string_size], " LI %u", pdu_info.li_list[index]);
- }
- }
-
- MSC_LOG_RX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_UE:MSC_RLC_ENB,
- (char *)pdu_info.payload,
- tb_size_in_bytes,
- message_string);
- }
-
if (LOG_DEBUGFLAG(DEBUG_RLC)) {
message_string_size = 0;
message_string_size += sprintf(&message_string[message_string_size], "Bearer : %ld\n", l_rlc_p->rb_id);
@@ -483,89 +432,61 @@ rlc_um_mac_data_request (const protocol_ctxt_t *const ctxt_pP, void *rlc_pP,cons
continue;
}
- if (MESSAGE_CHART_GENERATOR || LOG_DEBUGFLAG(DEBUG_RLC) ) {
+ if (LOG_DEBUGFLAG(DEBUG_RLC) ) {
rlc_um_get_pdu_infos(ctxt_pP, l_rlc_p,(rlc_um_pdu_sn_10_t *) ((struct mac_tb_req *) (tb_p->data))->data_ptr, tb_size_in_bytes, &pdu_info, l_rlc_p->rx_sn_length);
- if(MESSAGE_CHART_GENERATOR) {
- message_string_size = 0;
- message_string_size += sprintf(&message_string[message_string_size],
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_UM_MSC_FMT" DATA SN %u size %u FI %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_UM_MSC_ARGS(ctxt_pP, l_rlc_p),
- pdu_info.sn,
- tb_size_in_bytes,
- pdu_info.fi);
-
- if (pdu_info.e) {
- message_string_size += sprintf(&message_string[message_string_size], "|HE:");
-
- for (index=0; index < pdu_info.num_li; index++) {
- message_string_size += sprintf(&message_string[message_string_size], " LI %u", pdu_info.li_list[index]);
- }
+ message_string_size = 0;
+ message_string_size += sprintf(&message_string[message_string_size], "Bearer : %ld\n", l_rlc_p->rb_id);
+ message_string_size += sprintf(&message_string[message_string_size], "PDU size : %u\n", tb_size_in_bytes);
+ message_string_size += sprintf(&message_string[message_string_size], "Header size : %u\n", pdu_info.header_size);
+ message_string_size += sprintf(&message_string[message_string_size], "Payload size: %u\n", pdu_info.payload_size);
+ message_string_size += sprintf(&message_string[message_string_size], "PDU type : RLC UM DATA IND: UMD PDU\n\n");
+ message_string_size += sprintf(&message_string[message_string_size], "Header :\n");
+ message_string_size += sprintf(&message_string[message_string_size], " FI : %u\n", pdu_info.fi);
+ message_string_size += sprintf(&message_string[message_string_size], " E : %u\n", pdu_info.e);
+ message_string_size += sprintf(&message_string[message_string_size], " SN : %u\n", pdu_info.sn);
+
+ if (pdu_info.e) {
+ message_string_size += sprintf(&message_string[message_string_size], "\nHeader extension : \n");
+
+ for (index=0; index < pdu_info.num_li; index++) {
+ message_string_size += sprintf(&message_string[message_string_size], " LI : %u\n", pdu_info.li_list[index]);
}
-
- MSC_LOG_TX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_UE:MSC_RLC_ENB,
- (const char *)pdu_info.payload,
- pdu_info.payload_size,
- message_string);
}
- if(LOG_DEBUGFLAG(DEBUG_RLC)) {
- message_string_size = 0;
- message_string_size += sprintf(&message_string[message_string_size], "Bearer : %ld\n", l_rlc_p->rb_id);
- message_string_size += sprintf(&message_string[message_string_size], "PDU size : %u\n", tb_size_in_bytes);
- message_string_size += sprintf(&message_string[message_string_size], "Header size : %u\n", pdu_info.header_size);
- message_string_size += sprintf(&message_string[message_string_size], "Payload size: %u\n", pdu_info.payload_size);
- message_string_size += sprintf(&message_string[message_string_size], "PDU type : RLC UM DATA IND: UMD PDU\n\n");
- message_string_size += sprintf(&message_string[message_string_size], "Header :\n");
- message_string_size += sprintf(&message_string[message_string_size], " FI : %u\n", pdu_info.fi);
- message_string_size += sprintf(&message_string[message_string_size], " E : %u\n", pdu_info.e);
- message_string_size += sprintf(&message_string[message_string_size], " SN : %u\n", pdu_info.sn);
-
- if (pdu_info.e) {
- message_string_size += sprintf(&message_string[message_string_size], "\nHeader extension : \n");
-
- for (index=0; index < pdu_info.num_li; index++) {
- message_string_size += sprintf(&message_string[message_string_size], " LI : %u\n", pdu_info.li_list[index]);
- }
- }
-
- message_string_size += sprintf(&message_string[message_string_size], "\nPayload : \n");
- message_string_size += sprintf(&message_string[message_string_size], "------+-------------------------------------------------|\n");
- message_string_size += sprintf(&message_string[message_string_size], " | 0 1 2 3 4 5 6 7 8 9 a b c d e f |\n");
- message_string_size += sprintf(&message_string[message_string_size], "------+-------------------------------------------------|\n");
+ message_string_size += sprintf(&message_string[message_string_size], "\nPayload : \n");
+ message_string_size += sprintf(&message_string[message_string_size], "------+-------------------------------------------------|\n");
+ message_string_size += sprintf(&message_string[message_string_size], " | 0 1 2 3 4 5 6 7 8 9 a b c d e f |\n");
+ message_string_size += sprintf(&message_string[message_string_size], "------+-------------------------------------------------|\n");
- for (octet_index = 0; octet_index < pdu_info.payload_size; octet_index++) {
- if ((octet_index % 16) == 0) {
- if (octet_index != 0) {
- message_string_size += sprintf(&message_string[message_string_size], " |\n");
- }
-
- message_string_size += sprintf(&message_string[message_string_size], " %04d |", octet_index);
+ for (octet_index = 0; octet_index < pdu_info.payload_size; octet_index++) {
+ if ((octet_index % 16) == 0) {
+ if (octet_index != 0) {
+ message_string_size += sprintf(&message_string[message_string_size], " |\n");
}
- /*
- * Print every single octet in hexadecimal form
- */
- message_string_size += sprintf(&message_string[message_string_size], " %02x", pdu_info.payload[octet_index]);
- /*
- * Align newline and pipes according to the octets in groups of 2
- */
+ message_string_size += sprintf(&message_string[message_string_size], " %04d |", octet_index);
}
/*
- * Append enough spaces and put final pipe
+ * Print every single octet in hexadecimal form
*/
- for (index = octet_index; index < 16; ++index) {
- message_string_size += sprintf(&message_string[message_string_size], " ");
- }
+ message_string_size += sprintf(&message_string[message_string_size], " %02x", pdu_info.payload[octet_index]);
+ /*
+ * Align newline and pipes according to the octets in groups of 2
+ */
+ }
- message_string_size += sprintf(&message_string[message_string_size], " |\n");
- LOG_UI(RLC, "%s\n", message_string);
- } /*LOG_DEBUGFLAG(DEBUG_RLC) */
- } /* MESSAGE_CHART_GENERATOR || LOG_DEBUGFLAG(DEBUG_RLC) */
+ /*
+ * Append enough spaces and put final pipe
+ */
+ for (index = octet_index; index < 16; ++index) {
+ message_string_size += sprintf(&message_string[message_string_size], " ");
+ }
+
+ message_string_size += sprintf(&message_string[message_string_size], " |\n");
+ LOG_UI(RLC, "%s\n", message_string);
+ } /* LOG_DEBUGFLAG(DEBUG_RLC) */
tb_p = tb_p->next;
} /* while (tb_p != NULL) */
@@ -607,15 +528,6 @@ rlc_um_data_req (const protocol_ctxt_t *const ctxt_pP, void *rlc_pP, mem_block_t
//rlc_p->next_sdu_index = (rlc_p->next_sdu_index + 1) % rlc_p->size_input_sdus_buffer;
rlc_p->stat_tx_pdcp_sdu += 1;
rlc_p->stat_tx_pdcp_bytes += ((struct rlc_um_tx_sdu_management *) (sdu_pP->data))->sdu_size;
- MSC_LOG_RX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_UM_MSC_FMT" DATA-REQ size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_UM_MSC_ARGS(ctxt_pP, rlc_p),
- ((struct rlc_um_tx_sdu_management *) (sdu_pP->data))->sdu_size);
if (LOG_DEBUGFLAG(DEBUG_RLC) ) {
data_offset = sizeof (struct rlc_um_data_req_alloc);
@@ -660,14 +572,6 @@ rlc_um_data_req (const protocol_ctxt_t *const ctxt_pP, void *rlc_pP, mem_block_t
list_add_tail_eurecom(sdu_pP, &rlc_p->input_sdus);
RLC_UM_MUTEX_UNLOCK(&rlc_p->lock_input_sdus);
- if (MESSAGE_CHART_GENERATOR) {
- if (rlc_p->buffer_occupancy > 4096) {
- MSC_LOG_EVENT((ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 "PROTOCOL_RLC_AM_MSC_FMT" BO %u bytes",\
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP,rlc_p), rlc_p->buffer_occupancy);
- }
- }
-
LOG_T(RLC, PROTOCOL_RLC_UM_CTXT_FMT" BO %d , NB SDU %d\n",
PROTOCOL_RLC_UM_CTXT_ARGS(ctxt_pP,rlc_p),
rlc_p->buffer_occupancy,
diff --git a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.h b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.h
index be06551dde7c7ee50ac1d91be3e707ad3f019c7d..bd04ff3ece65cb43c275a7cd79ee8b0ac4224b3e 100644
--- a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.h
+++ b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.h
@@ -56,28 +56,13 @@
rLC_Pp->rb_id,\
__FUNCTION__
-#define PROTOCOL_RLC_UM_MSC_FMT "[RNTI %" PRIx16 " %s %02ld]"
-#define PROTOCOL_RLC_UM_MSC_ARGS(CTXT_Pp, rLC_Pp) \
- CTXT_Pp->rnti,\
- (rLC_Pp->is_data_plane) ? "DRB UM" : "SRB UM",\
- rLC_Pp->rb_id
-
#if defined(TRACE_RLC_MUTEX)
#define RLC_UM_MUTEX_LOCK(mUTEX, cTXT, rLC) \
do {\
int pmtl_rc = pthread_mutex_trylock(mUTEX);\
if (pmtl_rc != 0){\
if (pmtl_rc == EBUSY) {\
- MSC_LOG_EVENT((cTXT->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 " PROTOCOL_RLC_UM_MSC_FMT " Warning try lock %s busy",\
- PROTOCOL_RLC_UM_MSC_ARGS(cTXT,rLC),\
- #mUTEX);\
pthread_mutex_lock(mUTEX);\
- } else {\
- MSC_LOG_EVENT((cTXT->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,\
- "0 " PROTOCOL_RLC_UM_MSC_FMT " Error try lock %s %d",\
- PROTOCOL_RLC_UM_MSC_ARGS(cTXT,rLC),\
- #mUTEX, pmtl_rc);\
}\
}\
} while (0);
diff --git a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c
index 05c3423f76c36021710da06dd6931f8fe2897f59..bec815ac5da6a93d4c96daaeaae2a4a611e69282 100644
--- a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c
+++ b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c
@@ -32,7 +32,6 @@
#include "rlc_um_control_primitives.h"
#include "LTE_T-Reordering.h"
-#include "msc.h"
//-----------------------------------------------------------------------------
void config_req_rlc_um (
@@ -173,15 +172,6 @@ void config_req_rlc_um_asn1 (
PROTOCOL_RLC_UM_CTXT_ARGS(ctxt_pP,rlc_p),
rlc_p->rb_id,
ul_rlc_pP->sn_FieldLength);
- MSC_LOG_RX_DISCARDED_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RRC_ENB:MSC_RRC_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" CONFIG-REQ UL sn_FieldLength %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, rlc_p),
- ul_rlc_pP->sn_FieldLength);
return;
}
}
@@ -201,15 +191,6 @@ void config_req_rlc_um_asn1 (
PROTOCOL_RLC_UM_CTXT_ARGS(ctxt_pP,rlc_p),
rlc_p->rb_id,
dl_rlc_pP->sn_FieldLength);
- MSC_LOG_RX_DISCARDED_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RRC_ENB:MSC_RRC_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" CONFIG-REQ DL sn_FieldLength %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, rlc_p),
- dl_rlc_pP->sn_FieldLength);
return;
}
@@ -220,15 +201,6 @@ void config_req_rlc_um_asn1 (
PROTOCOL_RLC_UM_CTXT_ARGS(ctxt_pP,rlc_p),
rlc_p->rb_id,
dl_rlc_pP->t_Reordering);
- MSC_LOG_RX_DISCARDED_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RRC_ENB:MSC_RRC_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" CONFIG-REQ t_Reord %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, rlc_p),
- dl_rlc_pP->t_Reordering);
return;
}
}
@@ -239,34 +211,12 @@ void config_req_rlc_um_asn1 (
ul_sn_FieldLength,
dl_sn_FieldLength,
mbms_flagP);
- MSC_LOG_RX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RRC_ENB:MSC_RRC_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" CONFIG-REQ t_Reord %u rx snfl %u tx snfl %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, rlc_p),
- t_Reordering,
- ul_sn_FieldLength,
- dl_sn_FieldLength);
} else {
rlc_um_configure(ctxt_pP,rlc_p,
t_Reordering,
dl_sn_FieldLength,
ul_sn_FieldLength,
mbms_flagP);
- MSC_LOG_RX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RRC_ENB:MSC_RRC_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_AM_MSC_FMT" CONFIG-REQ t_Reord %u rx snfl %u tx snfl %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_AM_MSC_ARGS(ctxt_pP, rlc_p),
- t_Reordering,
- dl_sn_FieldLength,
- ul_sn_FieldLength);
}
}
}
diff --git a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c
index c8faa083584d66e37200982a570e1812e398f6fb..6d2380d4ffe840ac52139375c2eeb7fd6b9636b3 100644
--- a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c
+++ b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c
@@ -24,7 +24,6 @@
#include "platform_types.h"
#include "assertions.h"
//-----------------------------------------------------------------------------
-#include "msc.h"
#include "rlc.h"
#include "rlc_um.h"
#include "rlc_primitives.h"
diff --git a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_reassembly.c b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_reassembly.c
index 2eba22380335e3c4af9fbde9f7352d968c94bbec..ca43dab667f4dfafbac196cfa433bedb6feaf256 100644
--- a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_reassembly.c
+++ b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_reassembly.c
@@ -35,7 +35,6 @@
#include "list.h"
#include "LAYER2/MAC/mac_extern.h"
#include "common/utils/LOG/log.h"
-#include "msc.h"
//-----------------------------------------------------------------------------
inline void
@@ -117,17 +116,6 @@ rlc_um_send_sdu (const protocol_ctxt_t* const ctxt_pP, rlc_um_entity_t *rlc_pP)
rlc_pP->stat_rx_pdcp_sdu += 1;
rlc_pP->stat_rx_pdcp_bytes += rlc_pP->output_sdu_size_to_write;
- MSC_LOG_TX_MESSAGE(
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_RLC_ENB:MSC_RLC_UE,
- (ctxt_pP->enb_flag == ENB_FLAG_YES) ? MSC_PDCP_ENB:MSC_PDCP_UE,
- (const char*)(rlc_pP->output_sdu_in_construction->data),
- rlc_pP->output_sdu_size_to_write,
- MSC_AS_TIME_FMT" "PROTOCOL_RLC_UM_MSC_FMT" DATA-IND size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- PROTOCOL_RLC_UM_MSC_ARGS(ctxt_pP,rlc_pP),
- rlc_pP->output_sdu_size_to_write
- );
-
#if TEST_RLC_UM
#if TRACE_RLC_UM_DISPLAY_ASCII_DATA
rlc_pP->output_sdu_in_construction->data[rlc_pP->output_sdu_size_to_write] = 0;
diff --git a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.c b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.c
index 932bb1376e92593a488f6d4c12ffbb31d023afe3..4c047e3d92d762952bc94cbc7e4e43f218066fed 100644
--- a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.c
+++ b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.c
@@ -27,7 +27,6 @@
//-----------------------------------------------------------------------------
#include <assert.h>
#include "assertions.h"
-#include "msc.h"
#include "list.h"
#include "rlc_um.h"
#include "rlc_primitives.h"
diff --git a/openair2/LAYER2/RLC/rlc_proto_agent_primitives.h b/openair2/LAYER2/RLC/rlc_proto_agent_primitives.h
deleted file mode 100644
index 75ccc9fcdd001cd20a8a83a26b10a7755d517be5..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/rlc_proto_agent_primitives.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#ifndef __PROTO_AGENT_RLC_PRIMITIVES_H__
-#define __PROTO_AGENT_RLC_PRIMITIVES_H__
-
-#include "RRC/LTE/rrc_defs.h"
-#include "LAYER2/PROTO_AGENT/proto_agent.h"
-// PROTO AGENT
-pthread_t async_server_thread;
-int async_server_thread_finalize (void);
-void async_server_thread_init (void);
-
-pthread_mutex_t async_server_lock;
-pthread_cond_t async_server_notify;
-int async_server_shutdown;
-
-#endif
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
index 1442a9af7271fe2b44687d9a5387024cbf641920..e612d15b4c09fbedb5a1eacae825b41825c02dc5 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
@@ -101,13 +101,6 @@ typedef struct {
static rlc_data_req_queue q;
-extern rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP,
- const NR_SRB_ToAddModList_t * const srb2add_listP,
- const NR_DRB_ToAddModList_t * const drb2add_listP,
- const NR_DRB_ToReleaseList_t * const drb2release_listP,
- const LTE_PMCH_InfoList_r9_t * const pmch_InfoList_r9_pP,
- struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list);
-
static void *rlc_data_req_thread(void *_)
{
int i;
@@ -678,7 +671,7 @@ static void deliver_sdu_drb(void *_ue, nr_pdcp_entity_t *entity,
clock_gettime(CLOCK_REALTIME, &time_request);
LOG_D(PDCP, "%s() (drb %d) Time %lu.%lu sending message to gtp size %d\n", __func__, rb_id, time_request.tv_sec,time_request.tv_nsec,
size-offset);
- itti_send_msg_to_task(TASK_VARIABLE, INSTANCE_DEFAULT, message_p);
+ itti_send_msg_to_task(TASK_GTPV1_U, INSTANCE_DEFAULT, message_p);
}
}
}
@@ -732,7 +725,7 @@ rb_found:
LOG_I(PDCP, "%s() (drb %d) sending message to gtp size %d\n",
__func__, rb_id, size);
extern instance_t CUuniqInstance;
- itti_send_msg_to_task(TASK_VARIABLE, CUuniqInstance, message_p);
+ itti_send_msg_to_task(TASK_GTPV1_U, CUuniqInstance, message_p);
} else {
memblock = get_free_mem_block(size, __FUNCTION__);
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c b/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c
index d7923e5490bf0c0ebccb2b53044edc6efe4478cf..af8cb5715adbb67ab2ca37d47bf4e5d46853ad64 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c
@@ -1044,7 +1044,7 @@ next_pdu:
set_end_different_sdu:
/* don't go more than rx_highest_status - 1 */
if (sn_compare_rx(entity, entity->rx_highest_status, cur->sn) <= 0) {
- ret.so_end = (entity->rx_highest_status - 1 + entity->sn_modulus) %
+ ret.sn_end = (entity->rx_highest_status - 1 + entity->sn_modulus) %
entity->sn_modulus;
ret.so_end = 0xffff;
return ret;
@@ -1305,9 +1305,8 @@ static int missing_size(nr_rlc_entity_am_t *entity, missing_data_t *m,
missing_data_t m_nack;
/* be careful to limit a range to 255 SNs, that is: cut if needed */
- sn_count = m->sn_end - m->sn_start + 1;
- if (sn_count < 0)
- sn_count += entity->sn_modulus;
+ sn_count = (m->sn_end - m->sn_start + entity->sn_modulus)
+ % entity->sn_modulus + 1;
sn_start = m->sn_start;
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
index b9d617d2eb679e1fbdce7a1f84d05877bb5aa207..18ee7da8e2d3b282ba3a225836bd2e7de2ef6df7 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
@@ -40,8 +40,6 @@
#include "openair2/F1AP/f1ap_du_rrc_message_transfer.h"
-#include "openair2/LAYER2/PROTO_AGENT/proto_agent.h"
-
extern RAN_CONTEXT_t RC;
#include <stdint.h>
@@ -523,7 +521,7 @@ rb_found:
req->pdusession_id=rb_id;
LOG_D(RLC, "Received uplink user-plane traffic at RLC-DU to be sent to the CU, size %d \n", size);
extern instance_t DUuniqInstance;
- itti_send_msg_to_task(OCP_GTPV1_U, DUuniqInstance, msg);
+ itti_send_msg_to_task(TASK_GTPV1_U, DUuniqInstance, msg);
return;
}
}
diff --git a/openair2/LAYER2/rlc_v2/rlc_oai_api.c b/openair2/LAYER2/rlc_v2/rlc_oai_api.c
index 16c3db0cae3912a551bcff985123cf01a13cbc9d..2a6f00c13c49610de35312f286135352603411aa 100644
--- a/openair2/LAYER2/rlc_v2/rlc_oai_api.c
+++ b/openair2/LAYER2/rlc_v2/rlc_oai_api.c
@@ -440,7 +440,7 @@ rb_found:
req->rnti=ue->rnti;
req->rab_id=rb_id+4;
LOG_D(RLC, "Received uplink user-plane traffic at RLC-DU to be sent to the CU, size %d \n", size);
- itti_send_msg_to_task(OCP_GTPV1_U, DUuniqInstance, msg);
+ itti_send_msg_to_task(TASK_GTPV1_U, DUuniqInstance, msg);
return;
}
}
diff --git a/openair2/M2AP/m2ap_MCE_generate_messages.c b/openair2/M2AP/m2ap_MCE_generate_messages.c
index a28097cf1afe014dbc74681c0f5a1fa55b57a71b..969863b4459b29a3308aa5fb8b7fe6ecc5241e44 100644
--- a/openair2/M2AP/m2ap_MCE_generate_messages.c
+++ b/openair2/M2AP/m2ap_MCE_generate_messages.c
@@ -39,7 +39,6 @@
#include "m2ap_itti_messaging.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
@@ -174,8 +173,6 @@ int m2ap_MCE_generate_m2_setup_request(
return -1;
}
- //MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE, MSC_M2AP_TARGET_MCE, NULL, 0, "0 M2Setup/initiatingMessage assoc_id %u", m2ap_MCE_data_p->assoc_id);
-
m2ap_MCE_itti_send_sctp_data_req(instance_p->instance, m2ap_MCE_data_p->assoc_id, buffer, len, 0);
return ret;
@@ -311,8 +308,6 @@ int m2ap_MCE_generate_m2_setup_response(m2ap_MCE_instance_t *instance_p, m2ap_MC
m2ap_MCE_data_p->state = M2AP_MCE_STATE_READY;
- //MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE, MSC_M2AP_TARGET_MCE, NULL, 0, "0 M2Setup/successfulOutcome assoc_id %u", m2ap_MCE_data_p->assoc_id);
-
m2ap_MCE_itti_send_sctp_data_req(instance_p->instance, m2ap_MCE_data_p->assoc_id, buffer, len, 0);
return ret;
@@ -367,11 +362,6 @@ int m2ap_MCE_generate_m2_setup_failure(instance_t instance,
return -1;
}
- //MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE,
- // MSC_M2AP_TARGET_MCE, NULL, 0,
- // "0 M2Setup/unsuccessfulOutcome assoc_id %u cause %u value %u",
- // assoc_id, cause_type, cause_value);
-
m2ap_MCE_itti_send_sctp_data_req(instance, assoc_id, buffer, len, 0);
return ret;
@@ -557,8 +547,6 @@ int m2ap_MCE_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE, MSC_M2AP_TARGET_MCE, NULL, 0, "0 X2Handover/initiatingMessage assoc_id %u", m2ap_MCE_data_p->assoc_id);
-//
// m2ap_MCE_itti_send_sctp_data_req(instance_p->instance, m2ap_MCE_data_p->assoc_id, buffer, len, 1);
//
// return ret;
@@ -650,8 +638,6 @@ int m2ap_MCE_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE, MSC_M2AP_TARGET_MCE, NULL, 0, "0 X2Handover/successfulOutcome assoc_id %u", m2ap_MCE_data_p->assoc_id);
-//
// m2ap_MCE_itti_send_sctp_data_req(instance_p->instance, m2ap_MCE_data_p->assoc_id, buffer, len, 1);
//
// return ret;
@@ -712,8 +698,6 @@ int m2ap_MCE_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE, MSC_M2AP_TARGET_MCE, NULL, 0, "0 X2UEContextRelease/initiatingMessage assoc_id %u", m2ap_MCE_data_p->assoc_id);
-//
// m2ap_MCE_itti_send_sctp_data_req(instance_p->instance, m2ap_MCE_data_p->assoc_id, buffer, len, 1);
//
// return ret;
@@ -796,8 +780,6 @@ int m2ap_MCE_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE, MSC_M2AP_TARGET_MCE, NULL, 0, "0 X2HandoverCancel/initiatingMessage assoc_id %u", m2ap_MCE_data_p->assoc_id);
-//
// m2ap_MCE_itti_send_sctp_data_req(instance_p->instance, m2ap_MCE_data_p->assoc_id, buffer, len, 1);
//
// return ret;
diff --git a/openair2/M2AP/m2ap_MCE_handler.c b/openair2/M2AP/m2ap_MCE_handler.c
index 5a0e303218bfc744a3b51e31ea8b948bb8ecf532..3f6d5ff64df3d1f235bde37a81a7de05d5372fa2 100644
--- a/openair2/M2AP/m2ap_MCE_handler.c
+++ b/openair2/M2AP/m2ap_MCE_handler.c
@@ -44,7 +44,6 @@
#include "m2ap_MCE_interface_management.h"
//#include "m2ap_eNB_interface_management.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
diff --git a/openair2/M2AP/m2ap_MCE_interface_management.c b/openair2/M2AP/m2ap_MCE_interface_management.c
index 3b12f41cbefc35f7ef25271be186bd3edfa4d4f4..28f5fccffa4916bb33bc5110bc72a430b093314f 100644
--- a/openair2/M2AP/m2ap_MCE_interface_management.c
+++ b/openair2/M2AP/m2ap_MCE_interface_management.c
@@ -210,16 +210,7 @@ int MCE_handle_MBMS_SESSION_START_RESPONSE(instance_t instance,
AssertFatal(MCE_MBMS_M2AP_ID!=-1,"MCE_MBMS_M2AP_ID was not sent\n");
AssertFatal(ENB_MBMS_M2AP_ID!=-1,"ENB_MBMS_M2AP_ID was not sent\n");
//M2AP_SESSION_START_RESP(msg_p).
-// MSC_LOG_RX_MESSAGE(
-// MSC_M2AP_MCE,
-// MSC_M2AP_ENB,
- //return 0;
-// 0,
-// 0,
-// MSC_AS_TIME_FMT" MCE_handle_M2_SESSION_START_RESPONSE successfulOutcome assoc_id %d",
-// 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
-// assoc_id);
-//
+
LOG_D(M2AP, "Sending M2AP_SESSION_START_RESP ITTI message to ENB_APP with assoc_id (%d->%d)\n",
assoc_id,ENB_MODULE_ID_TO_INSTANCE(assoc_id));
itti_send_msg_to_task(TASK_MCE_APP, ENB_MODULE_ID_TO_INSTANCE(assoc_id), msg_g);
@@ -348,14 +339,6 @@ int MCE_handle_MBMS_SESSION_STOP_RESPONSE(instance_t instance,
AssertFatal(MCE_MBMS_M2AP_ID!=-1,"MCE_MBMS_M2AP_ID was not sent\n");
AssertFatal(ENB_MBMS_M2AP_ID!=-1,"ENB_MBMS_M2AP_ID was not sent\n");
// M2AP_SESSION_STOP_RESP(msg_p).
- // MSC_LOG_RX_MESSAGE(
- // MSC_M2AP_MCE,
- // MSC_M2AP_ENB,
- // 0,
- // 0,
- // MSC_AS_TIME_FMT" MCE_handle_M2_SESSION_STOP_RESPONSE successfulOutcome assoc_id %d",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // assoc_id);
// LOG_D(M2AP, "Sending M2AP_SESSION_START_RESP ITTI message to ENB_APP with assoc_id (%d->%d)\n",
// assoc_id,ENB_MODULE_ID_TO_INSTANCE(assoc_id));
@@ -645,14 +628,6 @@ int MCE_handle_MBMS_SCHEDULING_INFORMATION_RESPONSE(instance_t instance,
// }
//
// M2AP_SESSION_STOP_RESP(msg_p).
-// MSC_LOG_RX_MESSAGE(
-// MSC_M2AP_MCE,
-// MSC_M2AP_ENB,
-// 0,
-// 0,
-// MSC_AS_TIME_FMT" MCE_handle_M2_SCHEDULING_INFORMATION_RESPONSE successfulOutcome assoc_id %d",
-// 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
-// assoc_id);
//
// LOG_D(M2AP, "Sending M2AP_SCHEDULING_INFO_RESP ITTI message to ENB_APP with assoc_id (%d->%d)\n",
// assoc_id,ENB_MODULE_ID_TO_INSTANCE(assoc_id));
@@ -836,15 +811,6 @@ int MCE_handle_M2_SETUP_REQUEST(instance_t instance,
*m2ap_mce_data_from_enb = M2AP_SETUP_REQ(message_p);
//printf("m2ap_mce_data_from_enb->assoc_id %d %d\n",m2ap_mce_data_from_enb->assoc_id,assoc_id);
-// MSC_LOG_TX_MESSAGE(
-// MSC_M2AP_MCE,
-// MSC_RRC_ENB,
-// 0,
-// 0,
-// MSC_AS_TIME_FMT" MCE_handle_M2_SETUP_REQUEST",
-// 0,0//MSC_AS_TIME_ARGS(ctxt_pP),
-// );
-//
if (num_mbms_available > 0) {
itti_send_msg_to_task(TASK_MCE_APP, ENB_MODULE_ID_TO_INSTANCE(instance), message_p);
} else {
@@ -1217,15 +1183,6 @@ int MCE_handle_MCE_CONFIGURATION_UPDATE_FAILURE(instance_t instance,
//for (int i=0;i<num_cells_to_activate;i++)
// AssertFatal(M2AP_SETUP_RESP (msg_p).num_SI[i] > 0, "System Information %d is missing",i);
- //MSC_LOG_RX_MESSAGE(
- // MSC_M2AP_eNB,
- // MSC_M2AP_CU,
- // 0,
- // 0,
- // MSC_AS_TIME_FMT" eNB_handle_M2_SETUP_RESPONSE successfulOutcome assoc_id %d",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // assoc_id);
-
//LOG_D(M2AP, "Sending M2AP_SETUP_RESP ITTI message to ENB_APP with assoc_id (%d->%d)\n",
// assoc_id,ENB_MOeNBLE_ID_TO_INSTANCE(assoc_id));
@@ -1430,16 +1387,7 @@ int MCE_handle_MBMS_SERVICE_COUNTING_RESPONSE(instance_t instance,
//AssertFatal(MCE_MBMS_M2AP_ID!=-1,"MCE_MBMS_M2AP_ID was not sent\n");
//AssertFatal(ENB_MBMS_M2AP_ID!=-1,"ENB_MBMS_M2AP_ID was not sent\n");
//M2AP_SESSION_START_RESP(msg_p).
-// MSC_LOG_RX_MESSAGE(
-// MSC_M2AP_MCE,
-// MSC_M2AP_ENB,
- //return 0;
-// 0,
-// 0,
-// MSC_AS_TIME_FMT" MCE_handle_M2_SESSION_START_RESPONSE successfulOutcome assoc_id %d",
-// 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
-// assoc_id);
-//
+
//LOG_D(M2AP, "Sending ITTI message to ENB_APP with assoc_id (%d->%d)\n",
//assoc_id,ENB_MODULE_ID_TO_INSTANCE(assoc_id));
diff --git a/openair2/M2AP/m2ap_eNB_generate_messages.c b/openair2/M2AP/m2ap_eNB_generate_messages.c
index b6c821e1cee29b730894835219e06aef00bc8a61..6496d608b8bddcc91ffdf2d9ae5e3952b1e10eda 100644
--- a/openair2/M2AP/m2ap_eNB_generate_messages.c
+++ b/openair2/M2AP/m2ap_eNB_generate_messages.c
@@ -39,7 +39,6 @@
#include "m2ap_itti_messaging.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
@@ -169,15 +168,6 @@
//
//
// LOG_W(M2AP,"pdu.present %d\n",pdu.present);
-// // MSC_LOG_TX_MESSAGE(
-// // MSC_M2AP_eNB,
-// // MSC_M2AP_MCE,
-// // (const char *)buffer,
-// // len,
-// // MSC_AS_TIME_FMT" M2_SETUP_REQUEST initiatingMessage MCEname %s",
-// // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
-// // m2ap_eNB_data_p->ENBname);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance_p, m2ap_eNB_data_p->assoc_id, buffer, len, 0);
//
// return 0;
@@ -315,8 +305,6 @@
//
// m2ap_eNB_data_p->state = M2AP_ENB_STATE_READY;
//
-// //MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_ENB, MSC_M2AP_TARGET_ENB, NULL, 0, "0 M2Setup/successfulOutcome assoc_id %u", m2ap_eNB_data_p->assoc_id);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance_p->instance, m2ap_eNB_data_p->assoc_id, buffer, len, 0);
//
// return ret;
@@ -371,11 +359,6 @@
// return -1;
// }
//
-// //MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_ENB,
-// // MSC_M2AP_TARGET_ENB, NULL, 0,
-// // "0 M2Setup/unsuccessfulOutcome assoc_id %u cause %u value %u",
-// // assoc_id, cause_type, cause_value);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance, assoc_id, buffer, len, 0);
//
// return ret;
@@ -561,8 +544,6 @@ int m2ap_eNB_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_ENB, MSC_M2AP_TARGET_ENB, NULL, 0, "0 X2Handover/initiatingMessage assoc_id %u", m2ap_eNB_data_p->assoc_id);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance_p->instance, m2ap_eNB_data_p->assoc_id, buffer, len, 1);
//
// return ret;
@@ -654,8 +635,6 @@ int m2ap_eNB_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_ENB, MSC_M2AP_TARGET_ENB, NULL, 0, "0 X2Handover/successfulOutcome assoc_id %u", m2ap_eNB_data_p->assoc_id);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance_p->instance, m2ap_eNB_data_p->assoc_id, buffer, len, 1);
//
// return ret;
@@ -716,8 +695,6 @@ int m2ap_eNB_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_ENB, MSC_M2AP_TARGET_ENB, NULL, 0, "0 X2UEContextRelease/initiatingMessage assoc_id %u", m2ap_eNB_data_p->assoc_id);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance_p->instance, m2ap_eNB_data_p->assoc_id, buffer, len, 1);
//
// return ret;
@@ -800,8 +777,6 @@ int m2ap_eNB_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_ENB, MSC_M2AP_TARGET_ENB, NULL, 0, "0 X2HandoverCancel/initiatingMessage assoc_id %u", m2ap_eNB_data_p->assoc_id);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance_p->instance, m2ap_eNB_data_p->assoc_id, buffer, len, 1);
//
// return ret;
diff --git a/openair2/M2AP/m2ap_eNB_handler.c b/openair2/M2AP/m2ap_eNB_handler.c
index 9abc3374086569a2c39f570ae4703c77fc494eff..7c4a9758dab9f57565263e76afc84d76b72769da 100644
--- a/openair2/M2AP/m2ap_eNB_handler.c
+++ b/openair2/M2AP/m2ap_eNB_handler.c
@@ -44,7 +44,6 @@
//#include "m2ap_MCE_interface_management.h"
#include "m2ap_eNB_interface_management.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
diff --git a/openair2/M2AP/m2ap_eNB_interface_management.c b/openair2/M2AP/m2ap_eNB_interface_management.c
index 486e382e6928dc4b15e29867ef2d9b86435aa103..9bab8005257f20edd92c8ce6f6fda9e89b07b20e 100644
--- a/openair2/M2AP/m2ap_eNB_interface_management.c
+++ b/openair2/M2AP/m2ap_eNB_interface_management.c
@@ -44,7 +44,6 @@
#include "m2ap_itti_messaging.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
@@ -255,15 +254,6 @@ int eNB_send_MBMS_SCHEDULING_INFORMATION_RESPONSE(instance_t instance, m2ap_mbms
LOG_D(M2AP,"pdu.present %d\n",pdu.present);
- // MSC_LOG_TX_MESSAGE(
- // MSC_M2AP_eNB,
- // MSC_M2AP_MCE,
- // (const char *)buffer,
- // len,
- // MSC_AS_TIME_FMT" M2_SETUP_REQUEST initiatingMessage MCEname %s",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // m2ap_eNB_data_p->ENBname);
-
m2ap_eNB_itti_send_sctp_data_req(instance, m2ap_enb_data_g->assoc_id, buffer, len, 0);
return 0;
}
@@ -359,14 +349,6 @@ int eNB_send_MBMS_SESSION_START_RESPONSE(instance_t instance, m2ap_session_start
LOG_D(M2AP,"pdu.present %d\n",pdu.present);
- // MSC_LOG_TX_MESSAGE(
- // MSC_M2AP_eNB,
- // MSC_M2AP_MCE,
- // (const char *)buffer,
- // len,
- // MSC_AS_TIME_FMT" M2_SETUP_REQUEST initiatingMessage MCEname %s",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // m2ap_eNB_data_p->ENBname);
m2ap_eNB_itti_send_sctp_data_req(instance, m2ap_enb_data_g->assoc_id, buffer, len, 0);
return 0;
@@ -531,14 +513,6 @@ int eNB_send_MBMS_SESSION_STOP_RESPONSE(instance_t instance, m2ap_session_stop_r
LOG_D(M2AP,"pdu.present %d\n",pdu.present);
- // MSC_LOG_TX_MESSAGE(
- // MSC_M2AP_eNB,
- // MSC_M2AP_MCE,
- // (const char *)buffer,
- // len,
- // MSC_AS_TIME_FMT" M2_SETUP_REQUEST initiatingMessage MCEname %s",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // m2ap_eNB_data_p->ENBname);
m2ap_eNB_itti_send_sctp_data_req(instance, m2ap_enb_data_g->assoc_id, buffer, len, 0);
return 0;
@@ -700,15 +674,6 @@ int eNB_send_M2_SETUP_REQUEST(m2ap_eNB_instance_t *instance_p, m2ap_eNB_data_t*
LOG_D(M2AP,"pdu.present %d\n",pdu.present);
- // MSC_LOG_TX_MESSAGE(
- // MSC_M2AP_eNB,
- // MSC_M2AP_MCE,
- // (const char *)buffer,
- // len,
- // MSC_AS_TIME_FMT" M2_SETUP_REQUEST initiatingMessage MCEname %s",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // m2ap_eNB_data_p->ENBname);
-
// buffer = &bytes[0];
// len = 40;
@@ -826,15 +791,6 @@ int eNB_handle_M2_SETUP_RESPONSE(instance_t instance,
//for (int i=0;i<num_cells_to_activate;i++)
// AssertFatal(M2AP_SETUP_RESP (msg_p).num_SI[i] > 0, "System Information %d is missing",i);
- //MSC_LOG_RX_MESSAGE(
- // MSC_M2AP_eNB,
- // MSC_M2AP_CU,
- // 0,
- // 0,
- // MSC_AS_TIME_FMT" eNB_handle_M2_SETUP_RESPONSE successfulOutcome assoc_id %d",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // assoc_id);
-
//LOG_D(M2AP, "Sending M2AP_SETUP_RESP ITTI message to ENB_APP with assoc_id (%d->%d)\n",
// assoc_id,ENB_MOeNBLE_ID_TO_INSTANCE(assoc_id));
//itti_send_msg_to_task(TASK_ENB_APP, ENB_MODULE_ID_TO_INSTANCE(assoc_id), msg_p2);
@@ -880,15 +836,6 @@ int eNB_handle_M2_SETUP_FAILURE(instance_t instance,
//for (int i=0;i<num_cells_to_activate;i++)
// AssertFatal(M2AP_SETUP_RESP (msg_p).num_SI[i] > 0, "System Information %d is missing",i);
- //MSC_LOG_RX_MESSAGE(
- // MSC_M2AP_eNB,
- // MSC_M2AP_CU,
- // 0,
- // 0,
- // MSC_AS_TIME_FMT" eNB_handle_M2_SETUP_RESPONSE successfulOutcome assoc_id %d",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // assoc_id);
-
//LOG_D(M2AP, "Sending M2AP_SETUP_RESP ITTI message to ENB_APP with assoc_id (%d->%d)\n",
// assoc_id,ENB_MOeNBLE_ID_TO_INSTANCE(assoc_id));
@@ -1025,15 +972,6 @@ int eNB_send_eNB_CONFIGURATION_UPDATE(instance_t instance, m2ap_enb_configuratio
LOG_D(M2AP,"pdu.present %d\n",pdu.present);
- // MSC_LOG_TX_MESSAGE(
- // MSC_M2AP_eNB,
- // MSC_M2AP_MCE,
- // (const char *)buffer,
- // len,
- // MSC_AS_TIME_FMT" M2_SETUP_REQUEST initiatingMessage MCEname %s",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // m2ap_eNB_data_p->ENBname);
-
// buffer = &bytes[0];
// len = 40;
@@ -1086,15 +1024,6 @@ int eNB_handle_eNB_CONFIGURATION_UPDATE_FAILURE(instance_t instance,
//for (int i=0;i<num_cells_to_activate;i++)
// AssertFatal(M2AP_SETUP_RESP (msg_p).num_SI[i] > 0, "System Information %d is missing",i);
- //MSC_LOG_RX_MESSAGE(
- // MSC_M2AP_eNB,
- // MSC_M2AP_CU,
- // 0,
- // 0,
- // MSC_AS_TIME_FMT" eNB_handle_M2_SETUP_RESPONSE successfulOutcome assoc_id %d",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // assoc_id);
-
//LOG_D(M2AP, "Sending M2AP_SETUP_RESP ITTI message to ENB_APP with assoc_id (%d->%d)\n",
// assoc_id,ENB_MOeNBLE_ID_TO_INSTANCE(assoc_id));
diff --git a/openair2/M2AP/m2ap_handler.c b/openair2/M2AP/m2ap_handler.c
index 1221bcedb5a07b5d54317092eec6986bbb875f94..6d8405db140503e876ae0f55daf69038b31bc369 100644
--- a/openair2/M2AP/m2ap_handler.c
+++ b/openair2/M2AP/m2ap_handler.c
@@ -44,7 +44,6 @@
#include "m2ap_MCE_interface_management.h"
#include "m2ap_eNB_interface_management.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
diff --git a/openair2/MCE_APP/mce_config.c b/openair2/MCE_APP/mce_config.c
index 439f2d2061c9a85b0daa7c8d52c3a97ca2f09fd0..9d9d9028e5c01d6a716571c12a4fcdf298f9f912 100644
--- a/openair2/MCE_APP/mce_config.c
+++ b/openair2/MCE_APP/mce_config.c
@@ -54,8 +54,6 @@
#include "common/config/config_userapi.h"
#include "RRC_config_tools.h"
#include "enb_paramdef.h"
-#include "proto_agent.h"
-
#include "m3ap_MCE.h"
diff --git a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
index 46394e7c7aaf6b0ef35a3f9a4d463c7cfbd80231..ad4ab7da0557da94f767d097ef478632c717d0dc 100644
--- a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
@@ -61,7 +61,7 @@ extern uint8_t nfapi_mode;
void handle_nr_rach(NR_UL_IND_t *UL_info)
{
- if(NFAPI_MODE == NFAPI_MODE_PNF) {
+ if (NFAPI_MODE == NFAPI_MODE_PNF) {
if (UL_info->rach_ind.number_of_pdus > 0) {
LOG_D(PHY,"UL_info->UL_info->rach_ind.number_of_pdus:%d SFN/Slot:%d.%d \n", UL_info->rach_ind.number_of_pdus, UL_info->rach_ind.sfn,UL_info->rach_ind.slot);
oai_nfapi_nr_rach_indication(&UL_info->rach_ind);
@@ -69,68 +69,28 @@ void handle_nr_rach(NR_UL_IND_t *UL_info)
}
return;
}
- NR_UL_IND_t UL_INFO;
- nfapi_nr_rach_indication_t *rach_ind = NULL;
- if (get_softmodem_params()->emulate_l1)
- {
- if (gnb_rach_ind_queue.num_items == 0)
- return;
- LOG_I(NR_MAC, "gnb_rach_ind_queue size = %zu\n", gnb_rach_ind_queue.num_items);
- rach_ind = get_queue(&gnb_rach_ind_queue);
-
- UL_INFO.rach_ind = *rach_ind;
- UL_INFO.module_id = UL_info->module_id;
- UL_INFO.CC_id = UL_info->CC_id;
- }
- else
- {
- UL_INFO.rach_ind = UL_info->rach_ind;
- UL_INFO.module_id = UL_info->module_id;
- UL_INFO.CC_id = UL_info->CC_id;
- }
- int frame_diff = UL_info->frame - UL_INFO.rach_ind.sfn;
- if (frame_diff < 0)
- {
+ int frame_diff = UL_info->frame - UL_info->rach_ind.sfn;
+ if (frame_diff < 0) {
frame_diff += 1024;
}
bool in_timewindow = frame_diff == 0 || (frame_diff == 1 && UL_info->slot < 7);
- if (UL_INFO.rach_ind.number_of_pdus>0 && in_timewindow) {
+ if (UL_info->rach_ind.number_of_pdus > 0 && in_timewindow) {
LOG_A(MAC,"UL_info[Frame %d, Slot %d] Calling initiate_ra_proc RACH:SFN/SLOT:%d/%d\n",
- UL_info->frame, UL_info->slot, UL_INFO.rach_ind.sfn, UL_INFO.rach_ind.slot);
- int npdus = UL_INFO.rach_ind.number_of_pdus;
- for(int i = 0; i < npdus; i++) {
- UL_INFO.rach_ind.number_of_pdus--;
+ UL_info->frame, UL_info->slot, UL_info->rach_ind.sfn, UL_info->rach_ind.slot);
+ for (int i = 0; i < UL_info->rach_ind.number_of_pdus; i++) {
UL_info->rach_ind.number_of_pdus--;
- if (UL_INFO.rach_ind.pdu_list[i].num_preamble>0)
- AssertFatal(UL_INFO.rach_ind.pdu_list[i].num_preamble==1,
- "More than 1 preamble not supported\n");
-
- nr_initiate_ra_proc(UL_INFO.module_id,
- UL_INFO.CC_id,
- UL_INFO.rach_ind.sfn,
- UL_INFO.rach_ind.slot,
- UL_INFO.rach_ind.pdu_list[i].preamble_list[0].preamble_index,
- UL_INFO.rach_ind.pdu_list[i].freq_index,
- UL_INFO.rach_ind.pdu_list[i].symbol_index,
- UL_INFO.rach_ind.pdu_list[i].preamble_list[0].timing_advance);
- }
- }
- if (get_softmodem_params()->emulate_l1)
- {
- if (rach_ind && rach_ind->number_of_pdus > 0)
- {
- for(int i = 0; i < rach_ind->number_of_pdus; i++)
- {
- free(rach_ind->pdu_list[i].preamble_list);
- rach_ind->pdu_list[i].preamble_list = NULL;
- }
- free(rach_ind->pdu_list);
- rach_ind->pdu_list = NULL;
+ AssertFatal(UL_info->rach_ind.pdu_list[i].num_preamble == 1, "More than 1 preamble not supported\n");
+ nr_initiate_ra_proc(UL_info->module_id,
+ UL_info->CC_id,
+ UL_info->rach_ind.sfn,
+ UL_info->rach_ind.slot,
+ UL_info->rach_ind.pdu_list[i].preamble_list[0].preamble_index,
+ UL_info->rach_ind.pdu_list[i].freq_index,
+ UL_info->rach_ind.pdu_list[i].symbol_index,
+ UL_info->rach_ind.pdu_list[i].preamble_list[0].timing_advance);
}
- free(rach_ind);
- rach_ind = NULL;
}
}
@@ -146,26 +106,11 @@ void handle_nr_uci(NR_UL_IND_t *UL_info)
return;
}
- NR_UL_IND_t UL_INFO;
- nfapi_nr_uci_indication_t *uci_ind = NULL;
- if (get_softmodem_params()->emulate_l1)
- {
- if (gnb_uci_ind_queue.num_items == 0)
- return;
- LOG_I(NR_MAC, "gnb_uci_ind_queue size = %zu\n", gnb_uci_ind_queue.num_items);
- uci_ind = get_queue(&gnb_uci_ind_queue);
- UL_INFO.uci_ind = *uci_ind;
- }
- else
- {
- UL_INFO.uci_ind = UL_info->uci_ind;
- }
-
const module_id_t mod_id = UL_info->module_id;
- const frame_t frame = UL_INFO.uci_ind.sfn;
- const sub_frame_t slot = UL_INFO.uci_ind.slot;
- int num_ucis = UL_INFO.uci_ind.num_ucis;
- nfapi_nr_uci_t *uci_list = UL_INFO.uci_ind.uci_list;
+ const frame_t frame = UL_info->uci_ind.sfn;
+ const sub_frame_t slot = UL_info->uci_ind.slot;
+ int num_ucis = UL_info->uci_ind.num_ucis;
+ nfapi_nr_uci_t *uci_list = UL_info->uci_ind.uci_list;
for (int i = 0; i < num_ucis; i++) {
switch (uci_list[i].pdu_type) {
@@ -176,7 +121,7 @@ void handle_nr_uci(NR_UL_IND_t *UL_info)
case NFAPI_NR_UCI_FORMAT_0_1_PDU_TYPE: {
const nfapi_nr_uci_pucch_pdu_format_0_1_t *uci_pdu = &uci_list[i].pucch_pdu_format_0_1;
LOG_D(NR_MAC, "The received uci has sfn slot %d %d, num_ucis %d and pdu_size %d\n",
- UL_INFO.uci_ind.sfn, UL_INFO.uci_ind.slot, num_ucis, uci_list[i].pdu_size);
+ UL_info->uci_ind.sfn, UL_info->uci_ind.slot, num_ucis, uci_list[i].pdu_size);
handle_nr_uci_pucch_0_1(mod_id, frame, slot, uci_pdu);
break;
}
@@ -190,39 +135,8 @@ void handle_nr_uci(NR_UL_IND_t *UL_info)
}
}
- if (get_softmodem_params()->emulate_l1)
- {
- for (int i = 0; i < num_ucis; i++) {
- switch (uci_list[i].pdu_type) {
- case NFAPI_NR_UCI_FORMAT_0_1_PDU_TYPE:
- if (uci_list[i].pucch_pdu_format_0_1.harq) {
- free(uci_list[i].pucch_pdu_format_0_1.harq->harq_list);
- uci_list[i].pucch_pdu_format_0_1.harq->harq_list = NULL;
- }
- free(uci_list[i].pucch_pdu_format_0_1.harq);
- uci_list[i].pucch_pdu_format_0_1.harq = NULL;
- free(uci_list[i].pucch_pdu_format_0_1.sr);
- uci_list[i].pucch_pdu_format_0_1.sr = NULL;
- break;
+ UL_info->uci_ind.num_ucis = 0;
- case NFAPI_NR_UCI_FORMAT_2_3_4_PDU_TYPE:
- free(uci_list[i].pucch_pdu_format_2_3_4.harq.harq_payload);
- free(uci_list[i].pucch_pdu_format_2_3_4.csi_part1.csi_part1_payload);
- free(uci_list[i].pucch_pdu_format_2_3_4.csi_part2.csi_part2_payload);
- break;
- }
- }
- if (uci_ind && num_ucis > 0) {
- free(uci_list);
- uci_list = NULL;
- }
- free(uci_ind);
- uci_ind = NULL;
- }
- else
- {
- UL_info->uci_ind.num_ucis = 0;
- }
}
static bool crc_sfn_slot_matcher(void *wanted, void *candidate)
@@ -262,173 +176,202 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info)
return;
}
- NR_UL_IND_t UL_INFO;
- nfapi_nr_rx_data_indication_t *rx_ind = NULL;
- nfapi_nr_crc_indication_t *crc_ind = NULL;
- if (get_softmodem_params()->emulate_l1)
- {
- rx_ind = get_queue(&gnb_rx_ind_queue);
- if (!rx_ind)
- {
- LOG_D(NR_PHY, "No rx data indication (empty gnb_rx_ind_queue)\n");
- return;
+ if (UL_info->rx_ind.number_of_pdus > 0 && UL_info->crc_ind.number_crcs > 0) {
+ AssertFatal(UL_info->rx_ind.number_of_pdus == UL_info->crc_ind.number_crcs,
+ "number_of_pdus %d, number_crcs %d\n",
+ UL_info->rx_ind.number_of_pdus, UL_info->crc_ind.number_crcs);
+ for (int i = 0; i < UL_info->rx_ind.number_of_pdus; i++) {
+ const nfapi_nr_rx_data_pdu_t *rx = &UL_info->rx_ind.pdu_list[i];
+ const nfapi_nr_crc_t *crc = &UL_info->crc_ind.crc_list[i];
+ LOG_D(NR_PHY, "UL_info->crc_ind.pdu_list[%d].rnti:%04x "
+ "UL_info->rx_ind.pdu_list[%d].rnti:%04x\n",
+ i, crc->rnti, i, rx->rnti);
+
+ AssertFatal(crc->rnti == rx->rnti, "mis-match between CRC RNTI %04x and RX RNTI %04x\n",
+ crc->rnti, rx->rnti);
+
+ LOG_D(NR_MAC,
+ "%4d.%2d Calling rx_sdu (CRC %s/tb_crc_status %d)\n",
+ UL_info->frame,
+ UL_info->slot,
+ crc->tb_crc_status ? "error" : "ok",
+ crc->tb_crc_status);
+
+ /* if CRC passes, pass PDU, otherwise pass NULL as error indication */
+ nr_rx_sdu(UL_info->module_id,
+ UL_info->CC_id,
+ UL_info->rx_ind.sfn,
+ UL_info->rx_ind.slot,
+ rx->rnti,
+ crc->tb_crc_status ? NULL : rx->pdu,
+ rx->pdu_length,
+ rx->timing_advance,
+ rx->ul_cqi,
+ rx->rssi);
+ handle_nr_ul_harq(UL_info->CC_id, UL_info->module_id, UL_info->frame, UL_info->slot, crc);
}
+ }
+ UL_info->rx_ind.number_of_pdus = 0;
+ UL_info->crc_ind.number_crcs = 0;
+}
- int sfn_slot = NFAPI_SFNSLOT2HEX(rx_ind->sfn, rx_ind->slot);
-
- crc_ind = unqueue_matching(&gnb_crc_ind_queue,
- MAX_QUEUE_SIZE,
- crc_sfn_slot_matcher,
- &sfn_slot);
- if (!crc_ind)
+static void free_unqueued_nfapi_indications(nfapi_nr_rach_indication_t *rach_ind,
+ nfapi_nr_uci_indication_t *uci_ind,
+ nfapi_nr_rx_data_indication_t *rx_ind,
+ nfapi_nr_crc_indication_t *crc_ind) {
+ if (rach_ind && rach_ind->number_of_pdus > 0)
+ {
+ for(int i = 0; i < rach_ind->number_of_pdus; i++)
{
- LOG_D(NR_PHY, "No crc indication with the same SFN SLOT of rx indication %u %u\n", rx_ind->sfn, rx_ind->slot);
- put_queue(&gnb_rx_ind_queue, rx_ind);
- return;
+ free_and_zero(rach_ind->pdu_list[i].preamble_list);
}
+ free_and_zero(rach_ind->pdu_list);
+ free_and_zero(rach_ind);
+ }
+ if (uci_ind && uci_ind->num_ucis > 0)
+ {
+ for (int i = 0; i < uci_ind->num_ucis; i++) {
+ switch (uci_ind->uci_list[i].pdu_type) {
+ case NFAPI_NR_UCI_FORMAT_0_1_PDU_TYPE:
+ if (uci_ind->uci_list[i].pucch_pdu_format_0_1.harq) {
+ free_and_zero(uci_ind->uci_list[i].pucch_pdu_format_0_1.harq->harq_list);
+ }
+ free_and_zero(uci_ind->uci_list[i].pucch_pdu_format_0_1.harq);
+ free_and_zero(uci_ind->uci_list[i].pucch_pdu_format_0_1.sr);
+ break;
- UL_INFO.rx_ind = *rx_ind;
- UL_INFO.crc_ind = *crc_ind;
- UL_INFO.module_id = UL_info->module_id;
- UL_INFO.CC_id = UL_info->CC_id;
+ case NFAPI_NR_UCI_FORMAT_2_3_4_PDU_TYPE:
+ free_and_zero(uci_ind->uci_list[i].pucch_pdu_format_2_3_4.harq.harq_payload);
+ free_and_zero(uci_ind->uci_list[i].pucch_pdu_format_2_3_4.csi_part1.csi_part1_payload);
+ free_and_zero(uci_ind->uci_list[i].pucch_pdu_format_2_3_4.csi_part2.csi_part2_payload);
+ break;
+ }
+ }
+ free_and_zero(uci_ind->uci_list);
+ free_and_zero(uci_ind);
}
- else
+ if (rx_ind && rx_ind->number_of_pdus > 0)
{
- UL_INFO.rx_ind = UL_info->rx_ind;
- UL_INFO.crc_ind = UL_info->crc_ind;
- UL_INFO.module_id = UL_info->module_id;
- UL_INFO.CC_id = UL_info->CC_id;
+ free_and_zero(rx_ind->pdu_list);
+ free_and_zero(rx_ind);
}
+ if (crc_ind && crc_ind->number_crcs > 0)
+ {
+ free_and_zero(crc_ind->crc_list);
+ free_and_zero(crc_ind);
+ }
+}
- UL_INFO.frame = UL_INFO.rx_ind.sfn;
- UL_INFO.slot = UL_INFO.rx_ind.slot;
- UL_INFO.module_id = UL_info->module_id;
- UL_INFO.CC_id = UL_info->CC_id;
- LOG_D(NR_MAC, " UL_info frame slot vs rx_ind frame slot vs crc_ind slot frame slot = %u %u vs %u %u vs %u %u\n",
- UL_info->frame, UL_info->slot,
- UL_INFO.rx_ind.sfn, UL_INFO.rx_ind.slot,
- UL_INFO.crc_ind.sfn, UL_INFO.crc_ind.slot
- );
-
- if (UL_INFO.rx_ind.number_of_pdus > 0 && UL_INFO.crc_ind.number_crcs > 0) {
- for (int i = 0; i < UL_INFO.rx_ind.number_of_pdus; i++) {
- int j;
- for (j = 0; j < UL_INFO.crc_ind.number_crcs; j++) {
- // find crc_indication j corresponding rx_indication i
- const nfapi_nr_rx_data_pdu_t *rx = &UL_INFO.rx_ind.pdu_list[i];
- const nfapi_nr_crc_t *crc = &UL_INFO.crc_ind.crc_list[j];
- LOG_D(NR_PHY,
- "UL_INFO.crc_ind.pdu_list[%d].rnti:%04x "
- "UL_INFO.rx_ind.pdu_list[%d].rnti:%04x\n",
- j,
- crc->rnti,
- i,
- rx->rnti);
-
- if (crc->rnti != rx->rnti)
- {
- LOG_D(NR_MAC, "mis-match between CRC rnti %04x and RX rnit %04x\n", crc->rnti, rx->rnti);
- continue;
- }
+static void remove_crc_pdu(nfapi_nr_crc_indication_t *crc_ind, int index) {
+ AssertFatal(index >= 0, "Invalid index %d\n", index);
+ AssertFatal(index < crc_ind->number_crcs, "Invalid index %d\n", index);
+ AssertFatal(crc_ind->number_crcs > 0, "Invalid crc_ind->number_crcs %d\n", crc_ind->number_crcs);
- LOG_D(NR_MAC,
- "%4d.%2d Calling rx_sdu (CRC %s/tb_crc_status %d)\n",
- UL_INFO.frame,
- UL_INFO.slot,
- crc->tb_crc_status ? "error" : "ok",
- crc->tb_crc_status);
-
- /* if CRC passes, pass PDU, otherwise pass NULL as error indication */
- nr_rx_sdu(UL_INFO.module_id,
- UL_INFO.CC_id,
- UL_INFO.rx_ind.sfn,
- UL_INFO.rx_ind.slot,
- rx->rnti,
- crc->tb_crc_status ? NULL : rx->pdu,
- rx->pdu_length,
- rx->timing_advance,
- rx->ul_cqi,
- rx->rssi);
- handle_nr_ul_harq(UL_INFO.CC_id, UL_INFO.module_id, UL_INFO.frame, UL_INFO.slot, crc);
- break;
- } // for (j=0;j<UL_INFO.crc_ind.number_crcs;j++)
- if (get_softmodem_params()->emulate_l1)
- {
- int last = UL_INFO.crc_ind.number_crcs - 1;
- if (j < last)
- {
- crc_ind->crc_list[j] = crc_ind->crc_list[last];
- UL_INFO.crc_ind.number_crcs--;
- }
- else if (j == last)
- {
- UL_INFO.crc_ind.number_crcs--;
- }
+ memmove(crc_ind->crc_list + index,
+ crc_ind->crc_list + index + 1,
+ sizeof(*crc_ind->crc_list) * (crc_ind->number_crcs - index - 1));
+ crc_ind->number_crcs--;
+}
- last = UL_INFO.rx_ind.number_of_pdus - 1;
- if (i < last)
- {
- rx_ind->pdu_list[i] = rx_ind->pdu_list[last];
- UL_INFO.rx_ind.number_of_pdus--;
- i--;
- }
- else if (i == last)
- {
- UL_INFO.rx_ind.number_of_pdus--;
- }
- }
- } // for (i=0;i<UL_INFO.rx_ind.number_of_pdus;i++)
- if (get_softmodem_params()->emulate_l1)
- {
- if (UL_INFO.crc_ind.number_crcs > 0)
- {
- crc_ind->number_crcs = UL_INFO.crc_ind.number_crcs;
- requeue(&gnb_crc_ind_queue, crc_ind);
- }
+static void remove_rx_pdu(nfapi_nr_rx_data_indication_t *rx_ind, int index) {
+ AssertFatal(index >= 0, "Invalid index %d\n", index);
+ AssertFatal(index < rx_ind->number_of_pdus, "Invalid index %d\n", index);
+ AssertFatal(rx_ind->number_of_pdus > 0, "Invalid rx_ind->number_of_pdus %d\n", rx_ind->number_of_pdus);
- if (UL_INFO.rx_ind.number_of_pdus > 0)
- {
- rx_ind->number_of_pdus = UL_INFO.rx_ind.number_of_pdus;
- requeue(&gnb_rx_ind_queue, rx_ind);
- }
+ memmove(rx_ind->pdu_list + index,
+ rx_ind->pdu_list + index + 1,
+ sizeof(*rx_ind->pdu_list) * (rx_ind->number_of_pdus - index - 1));
+ rx_ind->number_of_pdus--;
+}
+
+static bool crc_ind_has_rnti(nfapi_nr_crc_indication_t *crc_ind, uint16_t rnti) {
+ for (int i = 0; i < crc_ind->number_crcs; i++) {
+ if (rnti == crc_ind->crc_list[i].rnti) {
+ return true;
+ }
+ }
+ return false;
+}
- if (UL_INFO.crc_ind.number_crcs == 0)
- {
- free(crc_ind->crc_list);
- crc_ind->crc_list = NULL;
- free(crc_ind);
- crc_ind = NULL;
+static bool rx_ind_has_rnti(nfapi_nr_rx_data_indication_t *rx_ind, uint16_t rnti) {
+ for (int i = 0; i < rx_ind->number_of_pdus; i++) {
+ if (rnti == rx_ind->pdu_list[i].rnti) {
+ return true;
+ }
+ }
+ return false;
+}
+
+static void match_crc_rx_pdu(nfapi_nr_rx_data_indication_t *rx_ind, nfapi_nr_crc_indication_t *crc_ind) {
+ AssertFatal(crc_ind->number_crcs > 0 && rx_ind->number_of_pdus > 0,
+ "Invalid number of crc_ind->number_crcs %d or rx_ind->number_of_pdus %d\n",
+ crc_ind->number_crcs, rx_ind->number_of_pdus);
+ if (crc_ind->number_crcs > rx_ind->number_of_pdus) {
+ int num_unmatched_crcs = 0;
+ nfapi_nr_crc_indication_t *crc_ind_unmatched = calloc(1, sizeof(*crc_ind_unmatched));
+ crc_ind_unmatched->header = crc_ind->header;
+ crc_ind_unmatched->sfn = crc_ind->sfn;
+ crc_ind_unmatched->slot = crc_ind->slot;
+ crc_ind_unmatched->number_crcs = crc_ind->number_crcs - rx_ind->number_of_pdus;
+ crc_ind_unmatched->crc_list = calloc(crc_ind_unmatched->number_crcs, sizeof(nfapi_nr_crc_t));
+ for (int i = 0; i < crc_ind->number_crcs; i++) {
+ if (!rx_ind_has_rnti(rx_ind, crc_ind->crc_list[i].rnti)) {
+ LOG_I(NR_MAC, "crc_ind->crc_list[%d].rnti %x does not match any rx_ind pdu rnti\n",
+ i, crc_ind->crc_list[i].rnti);
+ crc_ind_unmatched->crc_list[num_unmatched_crcs] = crc_ind->crc_list[i];
+ num_unmatched_crcs++;
+ remove_crc_pdu(crc_ind, i);
}
- if (UL_INFO.rx_ind.number_of_pdus == 0)
- {
- free(rx_ind->pdu_list);
- rx_ind->pdu_list = NULL;
- free(rx_ind);
- rx_ind = NULL;
+ if (crc_ind->number_crcs == rx_ind->number_of_pdus) {
+ break;
}
}
- else
+ AssertFatal(crc_ind_unmatched->number_crcs == num_unmatched_crcs, "crc_ind num_pdus %d doesnt match %d\n",
+ crc_ind_unmatched->number_crcs, num_unmatched_crcs);
+ if (!requeue(&gnb_crc_ind_queue, crc_ind_unmatched))
{
- UL_info->crc_ind.number_crcs = 0;
- UL_info->rx_ind.number_of_pdus = 0;
+ LOG_E(NR_PHY, "requeue failed for crc_ind_unmatched.\n");
+ free_and_zero(crc_ind_unmatched->crc_list);
+ free_and_zero(crc_ind_unmatched);
}
- } else if ((UL_INFO.rx_ind.number_of_pdus != 0)
- || (UL_INFO.crc_ind.number_crcs != 0)) {
- LOG_E(NR_PHY,
- "hoping not to have mis-match between CRC ind and RX ind - "
- "hopefully the missing message is coming shortly "
- "rx_ind:%d(SFN/SL:%d/%d) crc_ind:%d(SFN/SL:%d/%d) \n",
- UL_INFO.rx_ind.number_of_pdus,
- UL_INFO.rx_ind.sfn,
- UL_INFO.rx_ind.slot,
- UL_INFO.crc_ind.number_crcs,
- UL_INFO.crc_ind.sfn,
- UL_INFO.crc_ind.slot);
+ }
+ else if (crc_ind->number_crcs < rx_ind->number_of_pdus) {
+ int num_unmatched_rxs = 0;
+ nfapi_nr_rx_data_indication_t *rx_ind_unmatched = calloc(1, sizeof(*rx_ind_unmatched));
+ rx_ind_unmatched->header = rx_ind->header;
+ rx_ind_unmatched->sfn = rx_ind->sfn;
+ rx_ind_unmatched->slot = rx_ind->slot;
+ rx_ind_unmatched->number_of_pdus = rx_ind->number_of_pdus - crc_ind->number_crcs;
+ rx_ind_unmatched->pdu_list = calloc(rx_ind_unmatched->number_of_pdus, sizeof(nfapi_nr_pdu_t));
+ for (int i = 0; i < rx_ind->number_of_pdus; i++) {
+ if (!crc_ind_has_rnti(crc_ind, rx_ind->pdu_list[i].rnti)) {
+ LOG_I(NR_MAC, "rx_ind->pdu_list[%d].rnti %d does not match any crc_ind pdu rnti\n",
+ i, rx_ind->pdu_list[i].rnti);
+ rx_ind_unmatched->pdu_list[num_unmatched_rxs] = rx_ind->pdu_list[i];
+ num_unmatched_rxs++;
+ remove_rx_pdu(rx_ind, i);
+ }
+ if (rx_ind->number_of_pdus == crc_ind->number_crcs) {
+ break;
+ }
+ }
+ AssertFatal(rx_ind_unmatched->number_of_pdus == num_unmatched_rxs, "rx_ind num_pdus %d doesnt match %d\n",
+ rx_ind_unmatched->number_of_pdus, num_unmatched_rxs);
+ if (!requeue(&gnb_rx_ind_queue, rx_ind_unmatched))
+ {
+ LOG_E(NR_PHY, "requeue failed for rx_ind_unmatched.\n");
+ free_and_zero(rx_ind_unmatched->pdu_list);
+ free_and_zero(rx_ind_unmatched);
+ }
+ }
+ else {
+ LOG_E(NR_MAC, "The number of crc pdus %d = the number of rx pdus %d\n",
+ crc_ind->number_crcs, rx_ind->number_of_pdus);
}
}
void NR_UL_indication(NR_UL_IND_t *UL_info) {
- AssertFatal(UL_info!=NULL,"UL_INFO is null\n");
+ AssertFatal(UL_info!=NULL,"UL_info is null\n");
#ifdef DUMP_FAPI
dump_ul(UL_info);
#endif
@@ -438,17 +381,63 @@ void NR_UL_indication(NR_UL_IND_t *UL_info) {
NR_IF_Module_t *ifi = nr_if_inst[module_id];
gNB_MAC_INST *mac = RC.nrmac[module_id];
LOG_D(NR_PHY,"SFN/SLOT:%d.%d module_id:%d CC_id:%d UL_info[rach_pdus:%zu rx_ind:%zu crcs:%zu]\n",
- UL_info->frame,UL_info->slot,
- module_id,CC_id, gnb_rach_ind_queue.num_items,
- gnb_rx_ind_queue.num_items, gnb_crc_ind_queue.num_items);
+ UL_info->frame, UL_info->slot,
+ module_id, CC_id,
+ gnb_rach_ind_queue.num_items,
+ gnb_rx_ind_queue.num_items,
+ gnb_crc_ind_queue.num_items);
+
+ nfapi_nr_rach_indication_t *rach_ind = NULL;
+ nfapi_nr_uci_indication_t *uci_ind = NULL;
+ nfapi_nr_rx_data_indication_t *rx_ind = NULL;
+ nfapi_nr_crc_indication_t *crc_ind = NULL;
+ if (get_softmodem_params()->emulate_l1)
+ {
+ if (gnb_rach_ind_queue.num_items > 0) {
+ LOG_D(NR_MAC, "gnb_rach_ind_queue size = %zu\n", gnb_rach_ind_queue.num_items);
+ rach_ind = get_queue(&gnb_rach_ind_queue);
+ AssertFatal(rach_ind->number_of_pdus > 0, "Invalid number of PDUs\n");
+ UL_info->rach_ind = *rach_ind;
+ }
+ if (gnb_uci_ind_queue.num_items > 0) {
+ LOG_D(NR_MAC, "gnb_uci_ind_queue size = %zu\n", gnb_uci_ind_queue.num_items);
+ uci_ind = get_queue(&gnb_uci_ind_queue);
+ AssertFatal(uci_ind->num_ucis > 0, "Invalid number of PDUs\n");
+ UL_info->uci_ind = *uci_ind;
+ }
+ if (gnb_rx_ind_queue.num_items > 0 && gnb_crc_ind_queue.num_items > 0) {
+ LOG_D(NR_MAC, "gnb_rx_ind_queue size = %zu and gnb_crc_ind_queue size = %zu\n",
+ gnb_rx_ind_queue.num_items, gnb_crc_ind_queue.num_items);
+ rx_ind = get_queue(&gnb_rx_ind_queue);
+ int sfn_slot = NFAPI_SFNSLOT2HEX(rx_ind->sfn, rx_ind->slot);
+ crc_ind = unqueue_matching(&gnb_crc_ind_queue,
+ MAX_QUEUE_SIZE,
+ crc_sfn_slot_matcher,
+ &sfn_slot);
+ if (!crc_ind) {
+ LOG_I(NR_PHY, "No crc indication with the same SFN SLOT of rx indication %u %u\n", rx_ind->sfn, rx_ind->slot);
+ requeue(&gnb_rx_ind_queue, rx_ind);
+ }
+ else {
+ AssertFatal(rx_ind->number_of_pdus > 0, "Invalid number of PDUs\n");
+ AssertFatal(crc_ind->number_crcs > 0, "Invalid number of PDUs\n");
+ if (crc_ind->number_crcs != rx_ind->number_of_pdus)
+ match_crc_rx_pdu(rx_ind, crc_ind);
+ UL_info->rx_ind = *rx_ind;
+ UL_info->crc_ind = *crc_ind;
+ }
+ }
+ }
handle_nr_rach(UL_info);
-
handle_nr_uci(UL_info);
// clear UL DCI prior to handling ULSCH
mac->UL_dci_req[CC_id].numPdus = 0;
handle_nr_ulsch(UL_info);
+ if (get_softmodem_params()->emulate_l1) {
+ free_unqueued_nfapi_indications(rach_ind, uci_ind, rx_ind, crc_ind);
+ }
if (NFAPI_MODE != NFAPI_MODE_PNF) {
if (ifi->CC_mask==0) {
diff --git a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
index c7b54950d7c66eb9cc16653fa1276953100a033c..9bce0e884399e947fbc81083a4e5b1de328b87dd 100644
--- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
@@ -30,6 +30,10 @@
* \warning
*/
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
#include "PHY/defs_nr_UE.h"
#include "NR_IF_Module.h"
#include "NR_MAC_UE/mac_proto.h"
@@ -292,11 +296,11 @@ static void copy_dl_tti_req_to_dl_info(nr_downlink_indication_t *dl_info, nfapi_
{
NR_UE_MAC_INST_t *mac = get_mac_inst(dl_info->module_id);
mac->nr_ue_emul_l1.expected_sib = false;
- memset(mac->nr_ue_emul_l1.index_has_sib, 0, sizeof(*mac->nr_ue_emul_l1.index_has_sib));
+ memset(mac->nr_ue_emul_l1.index_has_sib, 0, sizeof(mac->nr_ue_emul_l1.index_has_sib));
mac->nr_ue_emul_l1.expected_rar = false;
- memset(mac->nr_ue_emul_l1.index_has_rar, 0, sizeof(*mac->nr_ue_emul_l1.index_has_rar));
+ memset(mac->nr_ue_emul_l1.index_has_rar, 0, sizeof(mac->nr_ue_emul_l1.index_has_rar));
mac->nr_ue_emul_l1.expected_dci = false;
- memset(mac->nr_ue_emul_l1.index_has_dci, 0, sizeof(*mac->nr_ue_emul_l1.index_has_dci));
+ memset(mac->nr_ue_emul_l1.index_has_dci, 0, sizeof(mac->nr_ue_emul_l1.index_has_dci));
int pdu_idx = 0;
int num_pdus = dl_tti_request->dl_tti_request_body.nPDUs;
@@ -420,7 +424,7 @@ static void copy_tx_data_req_to_dl_info(nr_downlink_indication_t *dl_info, nfapi
if (!dl_info->rx_ind)
{
- dl_info->rx_ind = CALLOC(1, sizeof(fapi_nr_rx_indication_t));
+ dl_info->rx_ind = CALLOC(num_pdus, sizeof(fapi_nr_rx_indication_t));
}
AssertFatal(dl_info->rx_ind != NULL, "%s: Out of memory in calloc", __FUNCTION__);
fapi_nr_rx_indication_t *rx_ind = dl_info->rx_ind;
@@ -1034,7 +1038,8 @@ int handle_dci(module_id_t module_id, int cc_id, unsigned int gNB_index, frame_t
// Note: sdu should always be processed because data and timing advance updates are transmitted by the UE
int8_t handle_dlsch(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment, int pdu_id){
- dl_info->rx_ind->rx_indication_body[pdu_id].pdsch_pdu.harq_pid = g_harq_pid;
+ if (get_softmodem_params()->emulate_l1)
+ dl_info->rx_ind->rx_indication_body[pdu_id].pdsch_pdu.harq_pid = g_harq_pid;
update_harq_status(dl_info->module_id,
dl_info->rx_ind->rx_indication_body[pdu_id].pdsch_pdu.harq_pid,
diff --git a/openair2/RRC/LTE/L2_interface.c b/openair2/RRC/LTE/L2_interface.c
index 37595192281a06d39cd55d7839b6c73f7e0b8aab..0a63acc8fb8882ded746feaa3316a3b626859503 100644
--- a/openair2/RRC/LTE/L2_interface.c
+++ b/openair2/RRC/LTE/L2_interface.c
@@ -43,7 +43,6 @@
#include "common/utils/LOG/log.h"
#include "rrc_eNB_UE_context.h"
#include "pdcp.h"
-#include "msc.h"
#include "common/ran_context.h"
#include "intertask_interface.h"
diff --git a/openair2/RRC/LTE/L2_interface_common.c b/openair2/RRC/LTE/L2_interface_common.c
index f70cc68550445263d677328bc2ac13279f786058..1993fe7de0973278c63cde20d1f247a174371f9b 100644
--- a/openair2/RRC/LTE/L2_interface_common.c
+++ b/openair2/RRC/LTE/L2_interface_common.c
@@ -34,7 +34,6 @@
#include "common/utils/LOG/log.h"
#include "rrc_eNB_UE_context.h"
#include "pdcp.h"
-#include "msc.h"
#include "common/ran_context.h"
#include "intertask_interface.h"
@@ -62,16 +61,6 @@ rrc_data_req(
return FALSE;
}
- MSC_LOG_TX_MESSAGE(
- ctxt_pP->enb_flag ? MSC_RRC_ENB : MSC_RRC_UE,
- ctxt_pP->enb_flag ? MSC_PDCP_ENB : MSC_PDCP_UE,
- buffer_pP,
- sdu_sizeP,
- MSC_AS_TIME_FMT"RRC_DCCH_DATA_REQ UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ctxt_pP->rnti,
- muiP,
- sdu_sizeP);
MessageDef *message_p;
// Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
uint8_t *message_buffer;
diff --git a/openair2/RRC/LTE/L2_interface_ue.c b/openair2/RRC/LTE/L2_interface_ue.c
index 5c1800cdd4dcfb3107db35726bf9527bafa368cb..534030864a295a2a59c95366ae448a0d66e5363f 100644
--- a/openair2/RRC/LTE/L2_interface_ue.c
+++ b/openair2/RRC/LTE/L2_interface_ue.c
@@ -44,7 +44,6 @@
#include "common/utils/LOG/log.h"
#include "rrc_eNB_UE_context.h"
#include "pdcp.h"
-#include "msc.h"
#include "intertask_interface.h"
@@ -274,16 +273,6 @@ rrc_data_req_ue(
)
//------------------------------------------------------------------------------
{
- MSC_LOG_TX_MESSAGE(
- ctxt_pP->enb_flag ? MSC_RRC_ENB : MSC_RRC_UE,
- ctxt_pP->enb_flag ? MSC_PDCP_ENB : MSC_PDCP_UE,
- buffer_pP,
- sdu_sizeP,
- MSC_AS_TIME_FMT"RRC_DCCH_DATA_REQ UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ctxt_pP->rnti,
- muiP,
- sdu_sizeP);
{
MessageDef *message_p;
// Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
diff --git a/openair2/RRC/LTE/MESSAGES/asn1_msg.c b/openair2/RRC/LTE/MESSAGES/asn1_msg.c
index b06959131618470ba8ce0c7cc9d82c64c23dbbd7..c3e41978e59a3f59b7a6f472d5d9d1f23d2d17aa 100644
--- a/openair2/RRC/LTE/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/LTE/MESSAGES/asn1_msg.c
@@ -4293,9 +4293,10 @@ ssize_t do_nrMeasurementReport(uint8_t *buffer,
LTE_MeasResultListEUTRA_t *measResultListEUTRA2=&measResultNeighCells->choice.measResultListEUTRA;
asn1cSequenceAdd(measResultListEUTRA2->list, struct LTE_MeasResultEUTRA, measresulteutra_list);
measresulteutra_list->physCellId = phy_id;
- //asn1cCalloc(measresulteutra_list->cgi_Info, measresult_cgi2);
- //measresult_cgi2->cellGlobalId= {0};
- //measresult_cgi2->trackingAreaCode= {0};
+ /* TODO: This asn1cCalloc leaks memory but also masks a bug.
+ If we delete this asn1cCalloc statement, eNB will crash in NSA mode.
+ Please don't delete the following line unless the bug has been found. */
+ asn1cCalloc(measresulteutra_list->cgi_Info, measresult_cgi2);
struct LTE_MeasResultEUTRA__measResult* measResult= &measresulteutra_list->measResult;
asn1cCallocOne(measResult->rsrpResult, rsrp_tar);
asn1cCallocOne(measResult->rsrqResult, rsrq_tar);
diff --git a/openair2/RRC/LTE/rrc_UE.c b/openair2/RRC/LTE/rrc_UE.c
index d0b89abb51e316f7af0a3cf18f410011523d2e8d..b46bba249268ff8466f195a3afb7a972f3eedebe 100644
--- a/openair2/RRC/LTE/rrc_UE.c
+++ b/openair2/RRC/LTE/rrc_UE.c
@@ -71,7 +71,6 @@
#include "pdcp.h"
#include "plmn_data.h"
-#include "msc.h"
#include <common/utils/system.h>
#include "intertask_interface.h"
@@ -1390,16 +1389,6 @@ rrc_ue_process_radioResourceConfigDedicated(
uint8_t *kUPenc = NULL;
derive_key_up_enc(UE_rrc_inst[ctxt_pP->module_id].integrity_algorithm,
UE_rrc_inst[ctxt_pP->module_id].kenb, &kUPenc);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_UE,
- MSC_PDCP_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" CONFIG_REQ UE %x DRB (security %X)",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ctxt_pP->rnti,
- UE_rrc_inst[ctxt_pP->module_id].ciphering_algorithm |
- (UE_rrc_inst[ctxt_pP->module_id].integrity_algorithm << 4));
// Refresh DRBs
rrc_pdcp_config_asn1_req(ctxt_pP,
(LTE_SRB_ToAddModList_t *)NULL,
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 260b6fceaa69a4d4539a9518b8f077472fd3ba5f..ea98d3169d50f6dcebe186bce87546040a4d9fcd 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -58,7 +58,6 @@
#include "rlc.h"
#include "rrc_eNB_UE_context.h"
#include "platform_types.h"
-#include "msc.h"
#include "LTE_SL-CommConfig-r12.h"
#include "LTE_PeriodicBSR-Timer-r12.h"
#include "LTE_RetxBSR-Timer-r12.h"
@@ -1247,16 +1246,6 @@ rrc_eNB_generate_SecurityModeCommand(
size,
rrc_eNB_mui,
DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" securityModeCommand UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_eNB_mui,
- size);
if (!NODE_IS_DU(RC.rrc[ctxt_pP->module_id]->node_type)) {
LOG_I(RRC,"calling rrc_data_req :securityModeCommand\n");
@@ -1301,16 +1290,6 @@ rrc_eNB_generate_UECapabilityEnquiry(
size,
rrc_eNB_mui,
DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" rrcUECapabilityEnquiry UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_eNB_mui,
- size);
rrc_data_req(
ctxt_pP,
DCCH,
@@ -1352,16 +1331,6 @@ rrc_eNB_generate_NR_UECapabilityEnquiry(
size,
rrc_eNB_mui,
DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" rrcNRUECapabilityEnquiry UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_eNB_mui,
- size);
rrc_data_req(
ctxt_pP,
DCCH,
@@ -1391,15 +1360,6 @@ rrc_eNB_generate_RRCConnectionReject(
(char *)(ue_p->Srb0.Tx_buffer.Payload),
ue_p->Srb0.Tx_buffer.payload_size,
"[MSG] RRCConnectionReject\n");
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- ue_p->Srb0.Tx_buffer.Header,
- ue_p->Srb0.Tx_buffer.payload_size,
- MSC_AS_TIME_FMT" LTE_RRCConnectionReject UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP == NULL ? -1 : ue_context_pP->ue_context.rnti,
- ue_p->Srb0.Tx_buffer.payload_size);
LOG_I(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel DL-CCCH, Generating LTE_RRCConnectionReject (bytes %d)\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
@@ -1509,14 +1469,6 @@ rrc_eNB_generate_RRCConnectionReestablishment(
} // for (int cnt = 0; cnt < (*SRB_configList)->list.count; cnt++)
} // if (*SRB_configList != NULL)
- MSC_LOG_TX_MESSAGE(MSC_RRC_ENB,
- MSC_RRC_UE,
- ue_context->Srb0.Tx_buffer.Header,
- ue_context->Srb0.Tx_buffer.payload_size,
- MSC_AS_TIME_FMT" LTE_RRCConnectionReestablishment UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context->rnti,
- ue_context->Srb0.Tx_buffer.payload_size);
LOG_I(RRC, PROTOCOL_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel DL-CCCH, Generating LTE_RRCConnectionReestablishment (bytes %d)\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
ue_context->Srb0.Tx_buffer.payload_size);
@@ -2058,16 +2010,6 @@ rrc_eNB_process_RRCConnectionReestablishmentComplete(
LOG_D(RRC,
"[FRAME %05d][RRC_eNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_eNB_mui, ctxt_pP->module_id, DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" LTE_RRCConnectionReconfiguration UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_eNB_mui,
- size);
rrc_data_req(
ctxt_pP,
DCCH,
@@ -2154,15 +2096,6 @@ rrc_eNB_generate_RRCConnectionReestablishmentReject(
(char *)(ue_p->Srb0.Tx_buffer.Payload),
ue_p->Srb0.Tx_buffer.payload_size,
"[MSG] RRCConnectionReestablishmentReject\n");
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- ue_p->Srb0.Tx_buffer.Header,
- ue_p->Srb0.Tx_buffer.payload_size,
- MSC_AS_TIME_FMT" LTE_RRCConnectionReestablishmentReject UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP == NULL ? -1 : ue_context_pP->ue_context.rnti,
- ue_p->Srb0.Tx_buffer.payload_size);
LOG_I(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel DL-CCCH, Generating LTE_RRCConnectionReestablishmentReject (bytes %d)\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
@@ -2230,16 +2163,6 @@ rrc_eNB_generate_RRCConnectionRelease(
size,
rrc_eNB_mui,
DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" LTE_RRCConnectionRelease UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_eNB_mui,
- size);
pthread_mutex_lock(&rrc_release_freelist);
for (release_num = 0; release_num < NUMBER_OF_UE_MAX; release_num++) {
@@ -2525,16 +2448,6 @@ rrc_eNB_generate_dedicatedRRCConnectionReconfiguration(const protocol_ctxt_t *co
LOG_D(RRC,
"[FRAME %05d][RRC_eNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_eNB_mui, ctxt_pP->module_id, DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" dedicated LTE_RRCConnectionReconfiguration UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_eNB_mui,
- size);
rrc_data_req(
ctxt_pP,
DCCH,
@@ -2773,16 +2686,6 @@ rrc_eNB_modify_dedicatedRRCConnectionReconfiguration(const protocol_ctxt_t *cons
LOG_D(RRC,
"[FRAME %05d][RRC_eNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_eNB_mui, ctxt_pP->module_id, DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" dedicated LTE_RRCConnectionReconfiguration UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_eNB_mui,
- size);
rrc_data_req(
ctxt_pP,
DCCH,
@@ -2883,16 +2786,6 @@ rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_release( const protocol_
LOG_D(RRC,
"[FRAME %05d][RRC_eNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_eNB_mui, ctxt_pP->module_id, DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" dedicated LTE_RRCConnectionReconfiguration UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_eNB_mui,
- size);
rrc_data_req(
ctxt_pP,
DCCH,
@@ -3603,15 +3496,6 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
rrc_eNB_mui,
ctxt_pP->module_id,
DCCH);
- MSC_LOG_TX_MESSAGE(MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" LTE_RRCConnectionReconfiguration UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_eNB_mui,
- size);
rrc_data_req(ctxt_pP,
DCCH,
rrc_eNB_mui++,
@@ -4316,15 +4200,6 @@ flexran_rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt
rrc_eNB_mui,
ctxt_pP->module_id,
DCCH);
- MSC_LOG_TX_MESSAGE(MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" LTE_RRCConnectionReconfiguration UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_eNB_mui,
- size);
rrc_data_req(ctxt_pP,
DCCH,
rrc_eNB_mui++,
@@ -4392,16 +4267,6 @@ rrc_eNB_generate_RRCConnectionReconfiguration_SCell(
);
LOG_I(RRC,"[eNB %d] Frame %d, Logical Channel DL-DCCH, Generate LTE_RRCConnectionReconfiguration (bytes %d, UE id %x)\n",
ctxt_pP->module_id,ctxt_pP->frame, size, ue_context_pP->ue_context.rnti);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" LTE_RRCConnectionReconfiguration UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_eNB_mui,
- size);
rrc_data_req(
ctxt_pP,
DCCH,
@@ -4996,7 +4861,6 @@ void rrc_eNB_handover_ue_context_release(
//msg_release_p = itti_alloc_new_message(TASK_RRC_ENB, 0, S1AP_UE_CONTEXT_RELEASE);
//itti_send_msg_to_task(TASK_S1AP, ctxt_pP->module_id, msg_release_p);
s1ap_ue_context_release(ctxt_pP->instance, ue_context_p->ue_context.eNB_ue_s1ap_id);
- //MSC_LOG_TX_MESSAGE(MSC_RRC_ENB, MSC_GTPU_ENB, NULL,0, "0 GTPV1U_ENB_DELETE_TUNNEL_REQ rnti %x ", eNB_ue_s1ap_id);
gtpv1u_enb_delete_tunnel_req_t delete_tunnels={0};
delete_tunnels.rnti = ue_context_p->ue_context.rnti;
delete_tunnels.from_gnb = 0;
@@ -6330,16 +6194,6 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
LOG_D(RRC,
"[FRAME %05d][RRC_eNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration handover to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_eNB_mui, ctxt_pP->module_id, DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" rrcConnectionReconfiguration handover UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_eNB_mui,
- size);
/* Refresh SRBs/DRBs */
rrc_pdcp_config_asn1_req(ctxt_pP,
*SRB_configList2, // NULL,
@@ -6535,9 +6389,6 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
ue_context_pP->ue_context.kenb,
&kRRCint);
/* Refresh SRBs/DRBs */
- MSC_LOG_TX_MESSAGE(MSC_RRC_ENB, MSC_PDCP_ENB, NULL, 0, MSC_AS_TIME_FMT" CONFIG_REQ UE %x DRB (security unchanged)",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti);
rrc_pdcp_config_asn1_req(ctxt_pP,
SRB_configList, // NULL,
DRB_configList,
@@ -6906,15 +6757,6 @@ rrc_eNB_generate_RRCConnectionSetup(
LOG_W(RRC, "Unknown node type %d\n", RC.rrc[ctxt_pP->module_id]->node_type);
}
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- ue_p->Srb0.Tx_buffer.Header, // LG WARNING
- ue_p->Srb0.Tx_buffer.payload_size,
- MSC_AS_TIME_FMT" RRCConnectionSetup UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- ue_p->Srb0.Tx_buffer.payload_size);
LOG_I(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel DL-CCCH, Generating RRCConnectionSetup (bytes %d)\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
@@ -7326,13 +7168,6 @@ rrc_eNB_decode_ccch(
LOG_I(RRC, PROTOCOL_RRC_CTXT_UE_FMT"CALLING RLC CONFIG SRB1 (rbid %d)\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
Idx);
- MSC_LOG_TX_MESSAGE(MSC_RRC_ENB,
- MSC_PDCP_ENB,
- NULL,
- 0,
- MSC_AS_TIME_FMT" CONFIG_REQ UE %x SRB",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti);
rrc_pdcp_config_asn1_req(ctxt_pP,
ue_context_p->ue_context.SRB_configList,
(LTE_DRB_ToAddModList_t *) NULL,
@@ -7373,15 +7208,6 @@ rrc_eNB_decode_ccch(
if (ue_context_p != NULL) {
// erase content
rrc_eNB_free_mem_UE_context(ctxt_pP, ue_context_p);
- MSC_LOG_RX_DISCARDED_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- dec_rval.consumed,
- MSC_AS_TIME_FMT" LTE_RRCConnectionRequest UE %x size %u (UE already in context)",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- dec_rval.consumed);
} else {
rrcConnectionRequest = &ul_ccch_msg->message.choice.c1.choice.rrcConnectionRequest.criticalExtensions.choice.rrcConnectionRequest_r8;
{
@@ -7467,18 +7293,6 @@ rrc_eNB_decode_ccch(
}
}
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- buffer,
- dec_rval.consumed,
- MSC_AS_TIME_FMT" RRCConnectionRequest UE %x size %u (s-TMSI mmec %u m_TMSI %u random UE id (0x%" PRIx64 ")",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- dec_rval.consumed,
- ue_context_p->ue_context.Initialue_identity_s_TMSI.mme_code,
- ue_context_p->ue_context.Initialue_identity_s_TMSI.m_tmsi,
- ue_context_p->ue_context.random_ue_identity);
} else {
LOG_E(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" RRCConnectionRequest without random UE identity or S-TMSI not supported, let's reject the UE\n",
@@ -7567,14 +7381,6 @@ rrc_eNB_decode_ccch(
LOG_I(RRC, PROTOCOL_RRC_CTXT_UE_FMT"CALLING RLC CONFIG SRB1 (rbid %d)\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
Idx);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_PDCP_ENB,
- NULL,
- 0,
- MSC_AS_TIME_FMT" CONFIG_REQ UE %x SRB",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti);
rrc_pdcp_config_asn1_req(ctxt_pP,
ue_context_p->ue_context.SRB_configList,
(LTE_DRB_ToAddModList_t *) NULL,
@@ -7949,15 +7755,6 @@ rrc_eNB_decode_dcch(
LOG_DUMPMSG(RRC,DEBUG_RRC,(char *)(Rx_sdu),sdu_sizeP,
"[MSG] RRC Connection Reconfiguration Complete\n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" LTE_RRCConnectionReconfigurationComplete UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
LOG_D(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" RLC RB %02d --- RLC_DATA_IND %d bytes "
"(RRCConnectionReconfigurationComplete) ---> RRC_eNB]\n",
@@ -8169,15 +7966,6 @@ rrc_eNB_decode_dcch(
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
LOG_DUMPMSG(RRC,DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
"[MSG] RRC Connection Reestablishment Complete\n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" LTE_RRCConnectionReestablishmentComplete UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
LOG_I(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" RLC RB %02d --- RLC_DATA_IND %d bytes "
"(rrcConnectionReestablishmentComplete) ---> RRC_eNB\n",
@@ -8254,15 +8042,6 @@ rrc_eNB_decode_dcch(
LOG_DUMPMSG(RRC,DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
"[MSG] RRC Connection SetupComplete\n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" LTE_RRCConnectionSetupComplete UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
LOG_D(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" RLC RB %02d --- RLC_DATA_IND %d bytes "
"(RRCConnectionSetupComplete) ---> RRC_eNB\n",
@@ -8308,15 +8087,6 @@ rrc_eNB_decode_dcch(
LOG_DUMPMSG(RRC,DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
"[MSG] RRC Security Mode Complete\n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" securityModeComplete UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
LOG_I(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" received securityModeComplete on UL-DCCH %d from UE\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
@@ -8345,15 +8115,6 @@ rrc_eNB_decode_dcch(
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
LOG_DUMPMSG(RRC,DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
"[MSG] RRC Security Mode Failure\n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" securityModeFailure UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
LOG_W(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" RLC RB %02d --- RLC_DATA_IND %d bytes "
"(securityModeFailure) ---> RRC_eNB\n",
@@ -8383,15 +8144,6 @@ rrc_eNB_decode_dcch(
LOG_DUMPMSG(RRC,DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
"[MSG] RRC UECapablility Information\n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" ueCapabilityInformation UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
LOG_I(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" received ueCapabilityInformation on UL-DCCH %d from UE\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
@@ -8569,15 +8321,6 @@ rrc_eNB_decode_dcch(
LOG_D(RRC,"[MSG] RRC UL Information Transfer \n");
LOG_DUMPMSG(RRC,DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
"[MSG] RRC UL Information Transfer \n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" ulInformationTransfer UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
if (EPC_MODE_ENABLED == 1) {
rrc_eNB_send_S1AP_UPLINK_NAS(ctxt_pP,
@@ -8668,15 +8411,6 @@ rrc_eNB_decode_dcch(
LOG_I(RRC,"THINH [LTE_UL_DCCH_MessageType__messageClassExtension_PR_c2]\n");
LOG_DUMPMSG(RRC,DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
"[MSG] RRC SidelinkUEInformation \n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" SidelinkUEInformation UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
LOG_I(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" RLC RB %02d --- RLC_DATA_IND %d bytes "
"(SidelinkUEInformation) ---> RRC_eNB\n",
@@ -9572,20 +9306,6 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
rrc_eNB_process_S1AP_UE_CONTEXT_RELEASE_COMMAND(msg_p, msg_name_p, instance);
break;
- case GTPV1U_ENB_DELETE_TUNNEL_RESP: {
- rrc_eNB_ue_context_t *ue = rrc_eNB_get_ue_context(RC.rrc[instance], GTPV1U_ENB_DELETE_TUNNEL_RESP(msg_p).rnti);
-
- if (ue != NULL
- && ue->ue_context.ue_release_timer_rrc > 0
- && (ue->ue_context.handover_info == NULL ||
- (ue->ue_context.handover_info->state != HO_RELEASE &&
- ue->ue_context.handover_info->state != HO_CANCEL))) {
- ue->ue_context.ue_release_timer_rrc = ue->ue_context.ue_release_timer_thres_rrc;
- }
-
- break;
- }
-
case S1AP_PATH_SWITCH_REQ_ACK:
LOG_I(RRC, "[eNB %ld] received path switch ack %s\n", instance, msg_name_p);
rrc_eNB_process_S1AP_PATH_SWITCH_REQ_ACK(msg_p, msg_name_p, instance);
diff --git a/openair2/RRC/LTE/rrc_eNB_GTPV1U.c b/openair2/RRC/LTE/rrc_eNB_GTPV1U.c
index 3fa17bcd6bdba76cee9054bd8af09e7c09eac88d..575a38ee3d9ddf56102f35fad5a74a3b96b0598f 100644
--- a/openair2/RRC/LTE/rrc_eNB_GTPV1U.c
+++ b/openair2/RRC/LTE/rrc_eNB_GTPV1U.c
@@ -32,7 +32,6 @@
# include "RRC/LTE/MESSAGES/asn1_msg.h"
# include "rrc_eNB_GTPV1U.h"
# include "rrc_eNB_UE_context.h"
-# include "msc.h"
#include "asn1_conversions.h"
@@ -77,15 +76,6 @@ rrc_eNB_process_GTPV1U_CREATE_TUNNEL_RESP(
create_tunnel_resp_pP->enb_addr.length);
}
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_GTPU_ENB,
- NULL,0,
- MSC_AS_TIME_FMT" CREATE_TUNNEL_RESP RNTI %"PRIx16" ntuns %u ebid %u enb-s1u teid %u",
- 0,0,rnti,
- create_tunnel_resp_pP->num_tunnels,
- ue_context_p->ue_context.enb_gtp_ebi[0],
- ue_context_p->ue_context.enb_gtp_teid[0]);
(void)rnti; /* avoid gcc warning "set but not used" */
return 0;
} else {
@@ -210,7 +200,7 @@ boolean_t gtpv_data_req_new (
GTPV1U_ENB_END_MARKER_REQ(msg).offset = GTPU_HEADER_OVERHEAD_MAX;
LOG_I(GTPU, "Send End Marker to GTPV1-U at frame %d and subframe %d \n", ctxt->frame,ctxt->subframe);
itti_send_msg_to_task(TASK_GTPV1_U, ENB_MODULE_ID_TO_INSTANCE(ctxt->module_id), msg);
- return NW_GTPV1U_OK;
+ return 0;
}
/* target enb */
@@ -225,7 +215,7 @@ boolean_t gtpv_data_req_new (
gtpv1u_enb_delete_tunnel_req_t delete_tunnel_req;
memset(&delete_tunnel_req, 0, sizeof(delete_tunnel_req));
delete_tunnel_req.rnti = ctxt->rnti;
- gtpv1u_delete_x2u_tunnel(ctxt->module_id, &delete_tunnel_req, GTPV1U_TARGET_ENB);
+ gtpv1u_delete_x2u_tunnel(ctxt->module_id, &delete_tunnel_req);
return true;
} else {
/* data packet */
diff --git a/openair2/RRC/LTE/rrc_eNB_M2AP.c b/openair2/RRC/LTE/rrc_eNB_M2AP.c
index a9c65eae1a12f0bd7dcade4b139413e3853b332a..5516308a1047a2563deb1f3434eebe9de73127f4 100644
--- a/openair2/RRC/LTE/rrc_eNB_M2AP.c
+++ b/openair2/RRC/LTE/rrc_eNB_M2AP.c
@@ -32,7 +32,6 @@
# include "RRC/LTE/MESSAGES/asn1_msg.h"
# include "rrc_eNB_M2AP.h"
//# include "rrc_eNB_UE_context.h"
-# include "msc.h"
# include "asn1_conversions.h"
# include "intertask_interface.h"
# include "common/ran_context.h"
diff --git a/openair2/RRC/LTE/rrc_eNB_S1AP.c b/openair2/RRC/LTE/rrc_eNB_S1AP.c
index 1a5fe55c26feb2732bc731efedd1a468eb060551..9b9e267828552335e0754e90f097435b51c13cc4 100644
--- a/openair2/RRC/LTE/rrc_eNB_S1AP.c
+++ b/openair2/RRC/LTE/rrc_eNB_S1AP.c
@@ -36,7 +36,6 @@
#include "rrc_eNB_S1AP.h"
#include "enb_config.h"
#include "common/ran_context.h"
-#include "gtpv1u.h"
#include "s1ap_eNB.h"
#include "s1ap_eNB_defs.h"
@@ -48,7 +47,6 @@
#include "pdcp_primitives.h"
#include "UTIL/OSA/osa_defs.h"
-#include <common/utils/msc/msc.h>
#include "LTE_UERadioAccessCapabilityInformation.h"
@@ -586,17 +584,6 @@ rrc_eNB_send_S1AP_INITIAL_CONTEXT_SETUP_RESP(
// TODO add cause when it will be integrated
}
}
-
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_S1AP_ENB,
- (const char *)&S1AP_INITIAL_CONTEXT_SETUP_RESP (msg_p),
- sizeof(s1ap_initial_context_setup_resp_t),
- MSC_AS_TIME_FMT" INITIAL_CONTEXT_SETUP_RESP UE %X eNB_ue_s1ap_id %u e_rabs:%u succ %u fail",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_id_rnti,
- S1AP_INITIAL_CONTEXT_SETUP_RESP (msg_p).eNB_ue_s1ap_id,
- e_rabs_done, e_rabs_failed);
}
//------------------------------------------------------------------------------
@@ -804,14 +791,6 @@ rrc_eNB_send_S1AP_NAS_FIRST_REQ(
ue_context_pP->ue_context.ue_gummei.mnc_len = S1AP_NAS_FIRST_REQ (message_p).ue_identity.gummei.mnc_len;
ue_context_pP->ue_context.ue_gummei.mme_code = S1AP_NAS_FIRST_REQ (message_p).ue_identity.gummei.mme_code;
ue_context_pP->ue_context.ue_gummei.mme_group_id = S1AP_NAS_FIRST_REQ (message_p).ue_identity.gummei.mme_group_id;
- MSC_LOG_TX_MESSAGE(MSC_S1AP_ENB,
- MSC_S1AP_MME,
- (const char *)&message_p->ittiMsg.s1ap_nas_first_req,
- sizeof(s1ap_nas_first_req_t),
- MSC_AS_TIME_FMT" S1AP_NAS_FIRST_REQ eNB %u UE %x",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ctxt_pP->module_id,
- ctxt_pP->rnti);
LOG_I(S1AP, "[eNB %d] Build S1AP_NAS_FIRST_REQ adding in s_TMSI: GUMMEI mme_code %u mme_group_id %u ue %x\n",
ctxt_pP->module_id,
S1AP_NAS_FIRST_REQ (message_p).ue_identity.gummei.mme_code,
@@ -852,15 +831,6 @@ rrc_eNB_process_S1AP_DOWNLINK_NAS(
eNB_ue_s1ap_id);
if (ue_context_p == NULL) {
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_S1AP_ENB,
- NULL,
- 0,
- MSC_AS_TIME_FMT" DOWNLINK-NAS UE initial id %u eNB_ue_s1ap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_initial_id,
- eNB_ue_s1ap_id);
/* Can not associate this message to an UE index, send a failure to S1AP and discard it! */
MessageDef *msg_fail_p;
LOG_W(RRC, "[eNB %ld] In S1AP_DOWNLINK_NAS: unknown UE from S1AP ids (%d, %d)\n", instance, ue_initial_id, eNB_ue_s1ap_id);
@@ -869,15 +839,6 @@ rrc_eNB_process_S1AP_DOWNLINK_NAS(
S1AP_NAS_NON_DELIVERY_IND (msg_fail_p).nas_pdu.length = S1AP_DOWNLINK_NAS (msg_p).nas_pdu.length;
S1AP_NAS_NON_DELIVERY_IND (msg_fail_p).nas_pdu.buffer = S1AP_DOWNLINK_NAS (msg_p).nas_pdu.buffer;
// TODO add failure cause when defined!
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_S1AP_ENB,
- (const char *)NULL,
- 0,
- MSC_AS_TIME_FMT" S1AP_NAS_NON_DELIVERY_IND UE initial id %u eNB_ue_s1ap_id %u (ue ctxt !found)",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_initial_id,
- eNB_ue_s1ap_id);
itti_send_msg_to_task (TASK_S1AP, instance, msg_fail_p);
return (-1);
} else {
@@ -889,15 +850,6 @@ rrc_eNB_process_S1AP_DOWNLINK_NAS(
ue_context_p->ue_context.eNB_ue_s1ap_id = S1AP_DOWNLINK_NAS (msg_p).eNB_ue_s1ap_id;
}
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_S1AP_ENB,
- (const char *)NULL,
- 0,
- MSC_AS_TIME_FMT" DOWNLINK-NAS UE initial id %u eNB_ue_s1ap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_initial_id,
- S1AP_DOWNLINK_NAS (msg_p).eNB_ue_s1ap_id);
/* Create message for PDCP (DLInformationTransfer_t) */
length = do_DLInformationTransfer (
instance,
@@ -1195,12 +1147,6 @@ rrc_eNB_send_S1AP_UE_CONTEXT_RELEASE_REQ(
if (ue_context_pP == NULL) {
LOG_E(RRC, "[eNB] In S1AP_UE_CONTEXT_RELEASE_REQ: invalid UE\n");
} else {
- MSC_LOG_TX_MESSAGE(MSC_RRC_ENB,
- MSC_S1AP_ENB,
- NULL,
- 0,
- "0 S1AP_UE_CONTEXT_RELEASE_REQ eNB_ue_s1ap_id 0x%06"PRIX32" ",
- ue_context_pP->ue_context.eNB_ue_s1ap_id);
MessageDef *msg_context_release_req_p = NULL;
msg_context_release_req_p = itti_alloc_new_message(TASK_RRC_ENB, 0, S1AP_UE_CONTEXT_RELEASE_REQ);
S1AP_UE_CONTEXT_RELEASE_REQ(msg_context_release_req_p).eNB_ue_s1ap_id = ue_context_pP->ue_context.eNB_ue_s1ap_id;
@@ -1214,9 +1160,6 @@ void rrc_eNB_send_S1AP_UE_CONTEXT_RELEASE_CPLT(
module_id_t enb_mod_idP,
uint32_t eNB_ue_s1ap_id
) {
- MSC_LOG_TX_MESSAGE(MSC_RRC_ENB, MSC_S1AP_ENB, NULL, 0,
- "0 S1AP_UE_CONTEXT_RELEASE_COMPLETE eNB_ue_s1ap_id 0x%06"PRIX32" ",
- eNB_ue_s1ap_id);
MessageDef *msg = itti_alloc_new_message(TASK_RRC_ENB, 0, S1AP_UE_CONTEXT_RELEASE_COMPLETE);
S1AP_UE_CONTEXT_RELEASE_COMPLETE(msg).eNB_ue_s1ap_id = eNB_ue_s1ap_id;
itti_send_msg_to_task(TASK_S1AP, ENB_MODULE_ID_TO_INSTANCE(enb_mod_idP), msg);
@@ -1247,14 +1190,6 @@ rrc_eNB_process_S1AP_UE_CONTEXT_RELEASE_COMMAND(
LOG_W(RRC, "[eNB %ld] In S1AP_UE_CONTEXT_RELEASE_COMMAND: unknown UE from eNB_ue_s1ap_id (%d)\n",
instance,
eNB_ue_s1ap_id);
- MSC_LOG_EVENT(MSC_RRC_ENB, "0 S1AP_UE_CONTEXT_RELEASE_COMPLETE eNB_ue_s1ap_id 0x%06"PRIX32" context not found",
- eNB_ue_s1ap_id);
- MSC_LOG_TX_MESSAGE(MSC_RRC_ENB,
- MSC_S1AP_ENB,
- NULL,
- 0,
- "0 S1AP_UE_CONTEXT_RELEASE_COMPLETE eNB_ue_s1ap_id 0x%06"PRIX32" ",
- eNB_ue_s1ap_id);
msg_complete_p = itti_alloc_new_message(TASK_RRC_ENB, 0, S1AP_UE_CONTEXT_RELEASE_COMPLETE);
S1AP_UE_CONTEXT_RELEASE_COMPLETE(msg_complete_p).eNB_ue_s1ap_id = eNB_ue_s1ap_id;
itti_send_msg_to_task(TASK_S1AP, instance, msg_complete_p);
@@ -1432,16 +1367,6 @@ int rrc_eNB_send_S1AP_E_RAB_SETUP_RESP(const protocol_ctxt_t *const ctxt_pP,
if ((e_rabs_done > 0) ) {
LOG_I(RRC,"S1AP_E_RAB_SETUP_RESP: sending the message: nb_of_erabs %d, total e_rabs %d, index %d\n",
ue_context_pP->ue_context.nb_of_e_rabs, ue_context_pP->ue_context.setup_e_rabs, e_rab);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_S1AP_ENB,
- (const char *)&S1AP_E_RAB_SETUP_RESP (msg_p),
- sizeof(s1ap_e_rab_setup_resp_t),
- MSC_AS_TIME_FMT" E_RAB_SETUP_RESP UE %X eNB_ue_s1ap_id %u e_rabs:%u succ %u fail",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_id_rnti,
- S1AP_E_RAB_SETUP_RESP (msg_p).eNB_ue_s1ap_id,
- e_rabs_done, e_rabs_failed);
itti_send_msg_to_task (TASK_S1AP, ctxt_pP->instance, msg_p);
}
@@ -1667,16 +1592,6 @@ int rrc_eNB_send_S1AP_E_RAB_MODIFY_RESP(const protocol_ctxt_t *const ctxt_pP,
if (e_rabs_done > 0 || e_rabs_failed > 0) {
LOG_D(RRC,"S1AP_E_RAB_MODIFY_RESP: sending the message: nb_of_modify_e_rabs %d, total e_rabs %d, index %d\n",
ue_context_pP->ue_context.nb_of_modify_e_rabs, ue_context_pP->ue_context.setup_e_rabs, e_rab);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_S1AP_ENB,
- (const char *)&S1AP_E_RAB_SETUP_RESP (msg_p),
- sizeof(s1ap_e_rab_setup_resp_t),
- MSC_AS_TIME_FMT" E_RAB_MODIFY_RESP UE %X eNB_ue_s1ap_id %u e_rabs:%u succ %u fail",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_id_rnti,
- S1AP_E_RAB_MODIFY_RESP (msg_p).eNB_ue_s1ap_id,
- e_rabs_done, e_rabs_failed);
itti_send_msg_to_task (TASK_S1AP, ctxt_pP->instance, msg_p);
} else {
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
@@ -2067,16 +1982,6 @@ int rrc_eNB_send_PATH_SWITCH_REQ(const protocol_ctxt_t *const ctxt_pP,
if (e_rabs_done > 0) {
LOG_I(RRC,"S1AP_PATH_SWITCH_REQ: sending the message: nb_of_erabstobeswitched %d, total e_rabs %d, index %d\n",
S1AP_PATH_SWITCH_REQ (msg_p).nb_of_e_rabs, ue_context_pP->ue_context.setup_e_rabs, e_rab);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_S1AP_ENB,
- (const char *)&S1AP_PATH_SWITCH_REQ (msg_p),
- sizeof(s1ap_path_switch_req_t),
- MSC_AS_TIME_FMT" PATH_SWITCH_REQ UE %X eNB_ue_s1ap_id %u e_rabs:%u succ",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_id_rnti,
- S1AP_PATH_SWITCH_REQ (msg_p).eNB_ue_s1ap_id,
- e_rabs_done);
itti_send_msg_to_task (TASK_S1AP, ctxt_pP->instance, msg_p);
} else {
itti_free(ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
@@ -2355,16 +2260,6 @@ int rrc_eNB_send_E_RAB_Modification_Indication(const protocol_ctxt_t *const ctxt
if (e_rab_modify_index > 0) {
LOG_I(RRC,"S1AP_E_RAB_MODIFICATION_IND: sending the message: nb_of_erabstobemodified %d, total e_rabs %d, index %d\n",
S1AP_E_RAB_MODIFICATION_IND (msg_p).nb_of_e_rabs_tobemodified, ue_context_pP->ue_context.setup_e_rabs, e_rab);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_S1AP_ENB,
- (const char *)&S1AP_E_RAB_MODIFICATION_IND (msg_p),
- sizeof(s1ap_e_rab_modification_ind_t),
- MSC_AS_TIME_FMT" E RAB MODIFICATION IND UE %X eNB_ue_s1ap_id %u e_rabs:%u succ",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_id_rnti,
- S1AP_E_RAB_MODIFICATION_IND (msg_p).eNB_ue_s1ap_id,
- e_rab_modify_index);
itti_send_msg_to_task (TASK_S1AP, ctxt_pP->instance, msg_p);
} else {
itti_free(ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
diff --git a/openair2/RRC/LTE/rrc_eNB_UE_context.c b/openair2/RRC/LTE/rrc_eNB_UE_context.c
index 2cc89adf1569553e2ba17b3e6c80f51ab819bfbe..0d262064b53b162eb57c432e173bca5d88733e09 100644
--- a/openair2/RRC/LTE/rrc_eNB_UE_context.c
+++ b/openair2/RRC/LTE/rrc_eNB_UE_context.c
@@ -35,7 +35,6 @@
#include "common/utils/LOG/log.h"
#include "rrc_eNB_UE_context.h"
-#include "msc.h"
//------------------------------------------------------------------------------
@@ -210,10 +209,6 @@ void rrc_eNB_remove_ue_context(
}
RB_REMOVE(rrc_ue_tree_s, &rrc_instance_pP->rrc_ue_head, ue_context_pP);
- MSC_LOG_EVENT(
- MSC_RRC_ENB,
- "0 Removed UE %"PRIx16" ",
- ue_context_pP->ue_context.rnti);
rrc_eNB_free_mem_UE_context(ctxt_pP, ue_context_pP);
uid_linear_allocator_free(rrc_instance_pP, ue_context_pP->local_uid);
free(ue_context_pP);
diff --git a/openair2/RRC/NR/L2_nr_interface.c b/openair2/RRC/NR/L2_nr_interface.c
index 80a01c413c89eb569adc0d32e17aadda0cbbe889..c04214d02f42abbd21978d131640455f360654ee 100644
--- a/openair2/RRC/NR/L2_nr_interface.c
+++ b/openair2/RRC/NR/L2_nr_interface.c
@@ -34,7 +34,6 @@
#include "nr_rrc_extern.h"
#include "common/utils/LOG/log.h"
#include "pdcp.h"
-#include "msc.h"
#include "common/ran_context.h"
#include "LAYER2/NR_MAC_COMMON/nr_mac_common.h"
#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
@@ -172,16 +171,6 @@ nr_rrc_data_req(
return FALSE;
}
- MSC_LOG_TX_MESSAGE(
- ctxt_pP->enb_flag ? MSC_RRC_GNB : MSC_RRC_UE,
- ctxt_pP->enb_flag ? MSC_PDCP_ENB : MSC_PDCP_UE,
- buffer_pP,
- sdu_sizeP,
- MSC_AS_TIME_FMT"RRC_DCCH_DATA_REQ UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ctxt_pP->rnti,
- muiP,
- sdu_sizeP);
MessageDef *message_p;
// Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
uint8_t *message_buffer;
@@ -325,7 +314,15 @@ int8_t nr_mac_rrc_data_ind(const module_id_t module_idP,
NR_ServingCellConfigCommon_t *scc=RC.nrrrc[module_idP]->carrier.servingcellconfigcommon;
memset(&cellGroupConfig,0,sizeof(cellGroupConfig));
- fill_initial_cellGroupConfig(rntiP,-1,&cellGroupConfig,scc,&RC.nrrrc[module_idP]->carrier);
+ struct rrc_gNB_ue_context_s *ue_context_p = rrc_gNB_allocate_new_UE_context(RC.nrrrc[module_idP]);
+ ue_context_p->ue_id_rnti = rntiP;
+ ue_context_p->ue_context.rnti = rntiP;
+ ue_context_p->ue_context.random_ue_identity = rntiP;
+ ue_context_p->ue_context.Srb0.Active = 1;
+ RB_INSERT(rrc_nr_ue_tree_s, &RC.nrrrc[module_idP]->rrc_ue_head, ue_context_p);
+
+ fill_initial_cellGroupConfig(ue_context_p->local_uid,&cellGroupConfig,scc,&RC.nrrrc[module_idP]->carrier);
+
MessageDef* tmp=itti_alloc_new_message_sized(TASK_RRC_GNB, 0, F1AP_INITIAL_UL_RRC_MESSAGE, sizeof(f1ap_initial_ul_rrc_message_t) + sdu_lenP);
f1ap_initial_ul_rrc_message_t *msg = &F1AP_INITIAL_UL_RRC_MESSAGE(tmp);
@@ -346,14 +343,6 @@ int8_t nr_mac_rrc_data_ind(const module_id_t module_idP,
memcpy(msg->rrc_container, sduP, sdu_lenP);
msg->rrc_container_length=sdu_lenP;
itti_send_msg_to_task(TASK_DU_F1, 0, tmp);
-
- struct rrc_gNB_ue_context_s *ue_context_p = rrc_gNB_allocate_new_UE_context(RC.nrrrc[module_idP]);
- ue_context_p->ue_id_rnti = rntiP;
- ue_context_p->ue_context.rnti = rntiP;
- ue_context_p->ue_context.random_ue_identity = rntiP;
- ue_context_p->ue_context.Srb0.Active = 1;
- RB_INSERT(rrc_nr_ue_tree_s, &RC.nrrrc[module_idP]->rrc_ue_head, ue_context_p);
-
return(0);
}
diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.c b/openair2/RRC/NR/MESSAGES/asn1_msg.c
index 4eb5b065859ca388e583ded0e0fe65b233af6609..665e27f7b79dfed2c844ed2fea52c6cc1d3d0713 100755
--- a/openair2/RRC/NR/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/NR/MESSAGES/asn1_msg.c
@@ -599,10 +599,12 @@ uint8_t do_SIB1_NR(rrc_gNB_carrier_data_t *carrier,
}
ServCellCom->ssb_PeriodicityServingCell = *configuration->scc->ssb_periodicityServingCell;
- ServCellCom->tdd_UL_DL_ConfigurationCommon = CALLOC(1,sizeof(struct NR_TDD_UL_DL_ConfigCommon));
- ServCellCom->tdd_UL_DL_ConfigurationCommon->referenceSubcarrierSpacing = configuration->scc->tdd_UL_DL_ConfigurationCommon->referenceSubcarrierSpacing;
- ServCellCom->tdd_UL_DL_ConfigurationCommon->pattern1 = configuration->scc->tdd_UL_DL_ConfigurationCommon->pattern1;
- ServCellCom->tdd_UL_DL_ConfigurationCommon->pattern2 = configuration->scc->tdd_UL_DL_ConfigurationCommon->pattern2;
+ if (configuration->scc->tdd_UL_DL_ConfigurationCommon) {
+ ServCellCom->tdd_UL_DL_ConfigurationCommon = CALLOC(1,sizeof(struct NR_TDD_UL_DL_ConfigCommon));
+ ServCellCom->tdd_UL_DL_ConfigurationCommon->referenceSubcarrierSpacing = configuration->scc->tdd_UL_DL_ConfigurationCommon->referenceSubcarrierSpacing;
+ ServCellCom->tdd_UL_DL_ConfigurationCommon->pattern1 = configuration->scc->tdd_UL_DL_ConfigurationCommon->pattern1;
+ ServCellCom->tdd_UL_DL_ConfigurationCommon->pattern2 = configuration->scc->tdd_UL_DL_ConfigurationCommon->pattern2;
+ }
ServCellCom->ss_PBCH_BlockPower = configuration->scc->ss_PBCH_BlockPower;
// ims-EmergencySupport
@@ -1002,8 +1004,7 @@ long rrc_get_max_nr_csrs(uint8_t max_rbs, long b_SRS) {
return c_srs;
}
-void fill_initial_SpCellConfig(rnti_t rnti,
- int uid,
+void fill_initial_SpCellConfig(int uid,
NR_SpCellConfig_t *SpCellConfig,
NR_ServingCellConfigCommon_t *scc,
rrc_gNB_carrier_data_t *carrier) {
@@ -1051,8 +1052,8 @@ void fill_initial_SpCellConfig(rnti_t rnti,
NR_PUCCH_Resource_t *pucchres0=calloc(1,sizeof(*pucchres0));
pucchres0->pucch_ResourceId=0;
//pucchres0->startingPRB=0;
- pucchres0->startingPRB=(8+rnti) % (curr_bwp/2);
- LOG_D(NR_RRC, "pucchres0->startPRB %ld rnti %d curr_bwp %d\n", pucchres0->startingPRB, rnti, curr_bwp);
+ pucchres0->startingPRB=(8+uid) % (curr_bwp/2);
+ LOG_D(NR_RRC, "pucchres0->startPRB %ld uid %d curr_bwp %d\n", pucchres0->startingPRB, uid, curr_bwp);
pucchres0->intraSlotFrequencyHopping=NULL;
pucchres0->secondHopPRB=NULL;
pucchres0->format.present= NR_PUCCH_Resource__format_PR_format0;
@@ -1714,8 +1715,7 @@ void fill_mastercellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig, NR_CellGr
ASN_SEQUENCE_ADD(&ue_context_mastercellGroup->rlc_BearerToAddModList->list, rlc_BearerConfig_drb);
}
-void fill_initial_cellGroupConfig(rnti_t rnti,
- int uid,
+void fill_initial_cellGroupConfig(int uid,
NR_CellGroupConfig_t *cellGroupConfig,
NR_ServingCellConfigCommon_t *scc,
rrc_gNB_carrier_data_t *carrier) {
@@ -1809,7 +1809,7 @@ void fill_initial_cellGroupConfig(rnti_t rnti,
cellGroupConfig->spCellConfig = calloc(1,sizeof(*cellGroupConfig->spCellConfig));
- fill_initial_SpCellConfig(rnti,uid,cellGroupConfig->spCellConfig,scc,carrier);
+ fill_initial_SpCellConfig(uid,cellGroupConfig->spCellConfig,scc,carrier);
cellGroupConfig->sCellToAddModList = NULL;
cellGroupConfig->sCellToReleaseList = NULL;
@@ -1888,7 +1888,7 @@ int do_RRCSetup(rrc_gNB_ue_context_t *const ue_context_pP,
}
else {
cellGroupConfig = calloc(1, sizeof(NR_CellGroupConfig_t));
- fill_initial_cellGroupConfig(ue_context_pP->ue_context.rnti,ue_context_pP->local_uid,cellGroupConfig,scc,carrier);
+ fill_initial_cellGroupConfig(ue_context_pP->local_uid,cellGroupConfig,scc,carrier);
enc_rval = uper_encode_to_buffer(&asn_DEF_NR_CellGroupConfig,
NULL,
diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.h b/openair2/RRC/NR/MESSAGES/asn1_msg.h
index 58dc4aae5150dd32d0e7adad03e5c49111592b03..71fe6f531c0a2606ae10da7bf2fe4a4d5a99d6ed 100644
--- a/openair2/RRC/NR/MESSAGES/asn1_msg.h
+++ b/openair2/RRC/NR/MESSAGES/asn1_msg.h
@@ -100,16 +100,14 @@ void do_SpCellConfig(gNB_RRC_INST *rrc,
uint8_t do_RRCReject(uint8_t Mod_id,
uint8_t *const buffer);
-void fill_initial_SpCellConfig(rnti_t rnti,
- int uid,
- NR_SpCellConfig_t *SpCellConfig,
- NR_ServingCellConfigCommon_t *scc,
+void fill_initial_SpCellConfig(int uid,
+ NR_SpCellConfig_t *SpCellConfig,
+ NR_ServingCellConfigCommon_t *scc,
rrc_gNB_carrier_data_t *carrier);
-void fill_initial_cellGroupConfig(rnti_t rnti,
- int uid,
- NR_CellGroupConfig_t *cellGroupConfig,
- NR_ServingCellConfigCommon_t *scc,
+void fill_initial_cellGroupConfig(int uid,
+ NR_CellGroupConfig_t *cellGroupConfig,
+ NR_ServingCellConfigCommon_t *scc,
rrc_gNB_carrier_data_t *carrier);
void fill_mastercellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig, NR_CellGroupConfig_t *ue_context_mastercellGroup,int use_rlc_um_for_drb);
diff --git a/openair2/RRC/NR/nr_rrc_config.c b/openair2/RRC/NR/nr_rrc_config.c
index af1fb9224789a92ae62bfa29fdd7bbe4461e5baf..96ee78c62951d7d5b50263cb56c7519504959e54 100644
--- a/openair2/RRC/NR/nr_rrc_config.c
+++ b/openair2/RRC/NR/nr_rrc_config.c
@@ -34,14 +34,17 @@
void nr_rrc_config_dl_tda(NR_ServingCellConfigCommon_t *scc){
lte_frame_type_t frame_type = get_frame_type(*scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0], *scc->ssbSubcarrierSpacing);
-
+ int curr_bwp = scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->carrierBandwidth;
+ // coreset duration setting to be improved in the framework of RRC harmonization, potentially using a common function
+ int len_coreset = 1;
+ if (curr_bwp < 48)
+ len_coreset = 2;
// setting default TDA for DL with
struct NR_PDSCH_TimeDomainResourceAllocation *timedomainresourceallocation = CALLOC(1,sizeof(NR_PDSCH_TimeDomainResourceAllocation_t));
timedomainresourceallocation->mappingType = NR_PDSCH_TimeDomainResourceAllocation__mappingType_typeA;
- timedomainresourceallocation->startSymbolAndLength = get_SLIV(1,13); // basic slot configuration starting in symbol 1 til the end of the slot
+ timedomainresourceallocation->startSymbolAndLength = get_SLIV(len_coreset,14-len_coreset); // basic slot configuration starting in symbol 1 til the end of the slot
ASN_SEQUENCE_ADD(&scc->downlinkConfigCommon->initialDownlinkBWP->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList->list,
timedomainresourceallocation);
-
if(frame_type==TDD) {
// TDD
if(scc->tdd_UL_DL_ConfigurationCommon) {
@@ -49,7 +52,7 @@ void nr_rrc_config_dl_tda(NR_ServingCellConfigCommon_t *scc){
if(dl_symb > 1) {
timedomainresourceallocation = CALLOC(1,sizeof(NR_PDSCH_TimeDomainResourceAllocation_t));
timedomainresourceallocation->mappingType = NR_PDSCH_TimeDomainResourceAllocation__mappingType_typeA;
- timedomainresourceallocation->startSymbolAndLength = get_SLIV(1,dl_symb-1); // mixed slot configuration starting in symbol 1 til the end of the dl allocation
+ timedomainresourceallocation->startSymbolAndLength = get_SLIV(len_coreset,dl_symb-len_coreset); // mixed slot configuration starting in symbol 1 til the end of the dl allocation
ASN_SEQUENCE_ADD(&scc->downlinkConfigCommon->initialDownlinkBWP->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList->list,
timedomainresourceallocation);
}
diff --git a/openair2/RRC/NR/nr_rrc_defs.h b/openair2/RRC/NR/nr_rrc_defs.h
index 042f407eaf687b7aea89d93cc671791389e186b2..6d11cb05779dc785e38dc109c5c730c7f00e4e49 100644
--- a/openair2/RRC/NR/nr_rrc_defs.h
+++ b/openair2/RRC/NR/nr_rrc_defs.h
@@ -345,14 +345,18 @@ typedef struct gNB_RRC_UE_s {
uint8_t setup_e_rabs;
/* Number of e_rab to be setup in the list */
uint8_t nb_of_e_rabs;
- /* Total number of pdu session already setup in the list */
- uint8_t setup_pdu_sessions;
- /* Number of pdu session to be setup in the list */
- uint8_t nb_of_pdusessions;
/* Number of e_rab to be modified in the list */
uint8_t nb_of_modify_e_rabs;
uint8_t nb_of_failed_e_rabs;
e_rab_param_t modify_e_rab[NB_RB_MAX];//[S1AP_MAX_E_RAB];
+ /* Total number of pdu session already setup in the list */
+ uint8_t setup_pdu_sessions;
+ /* Number of pdu session to be setup in the list */
+ uint8_t nb_of_pdusessions;
+ /* Number of e_rab to be modified in the list */
+ uint8_t nb_of_modify_pdusessions;
+ uint8_t nb_of_failed_pdusessions;
+ pdu_session_param_t modify_pdusession[NR_NB_RB_MAX];
/* list of e_rab to be setup by RRC layers */
/* list of pdu session to be setup by RRC layers */
e_rab_param_t e_rab[NB_RB_MAX];//[S1AP_MAX_E_RAB];
diff --git a/openair2/RRC/NR/nr_rrc_proto.h b/openair2/RRC/NR/nr_rrc_proto.h
index b8ca1190a0ee019ee58575d10f96049d8f6cc88d..205267e28821bec622f2166b59f8b09d54cb53a1 100644
--- a/openair2/RRC/NR/nr_rrc_proto.h
+++ b/openair2/RRC/NR/nr_rrc_proto.h
@@ -114,9 +114,6 @@ void apply_macrlc_config(gNB_RRC_INST *rrc,
rrc_gNB_ue_context_t *const ue_context_pP,
const protocol_ctxt_t *const ctxt_pP );
-void apply_pdcp_config(rrc_gNB_ue_context_t *const ue_context_pP,
- const protocol_ctxt_t *const ctxt_pP );
-
void
rrc_gNB_generate_RRCSetup(
const protocol_ctxt_t *const ctxt_pP,
@@ -211,3 +208,24 @@ void
rrc_gNB_generate_dedicatedRRCReconfiguration(
const protocol_ctxt_t *const ctxt_pP,
rrc_gNB_ue_context_t *ue_context_pP);
+
+rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP,
+ const NR_SRB_ToAddModList_t * const srb2add_listP,
+ const NR_DRB_ToAddModList_t * const drb2add_listP,
+ const NR_DRB_ToReleaseList_t * const drb2release_listP,
+ const LTE_PMCH_InfoList_r9_t * const pmch_InfoList_r9_pP,
+ struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list);
+
+boolean_t nr_rrc_pdcp_config_asn1_req(
+ const protocol_ctxt_t *const ctxt_pP,
+ NR_SRB_ToAddModList_t *const srb2add_list,
+ NR_DRB_ToAddModList_t *const drb2add_list,
+ NR_DRB_ToReleaseList_t *const drb2release_list,
+ const uint8_t security_modeP,
+ uint8_t *const kRRCenc,
+ uint8_t *const kRRCint,
+ uint8_t *const kUPenc,
+ uint8_t *const kUPint
+ ,LTE_PMCH_InfoList_r9_t *pmch_InfoList_r9
+ ,rb_id_t *const defaultDRB,
+ struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list);
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 3403c531b470592b7ae258110b8cbdd57671f1ea..0d78c295937ac2a303500f4e57d9d8e628146a2b 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -30,6 +30,10 @@
#define RRC_GNB_C
#define RRC_GNB_C
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
#include "nr_rrc_config.h"
#include "nr_rrc_defs.h"
#include "nr_rrc_extern.h"
@@ -66,7 +70,6 @@
#include "rlc.h"
#include "rrc_eNB_UE_context.h"
#include "platform_types.h"
-#include "msc.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
#include "T.h"
@@ -95,6 +98,7 @@
#include <openair2/RRC/NR/rrc_gNB_UE_context.h>
#include <openair2/X2AP/x2ap_eNB.h>
#include <openair3/ocp-gtpu/gtp_itf.h>
+#include <openair2/RRC/NR/nr_rrc_proto.h>
#include "BIT_STRING.h"
#include "assertions.h"
@@ -103,27 +107,6 @@
extern RAN_CONTEXT_t RC;
-extern boolean_t nr_rrc_pdcp_config_asn1_req(
- const protocol_ctxt_t *const ctxt_pP,
- NR_SRB_ToAddModList_t *const srb2add_list,
- NR_DRB_ToAddModList_t *const drb2add_list,
- NR_DRB_ToReleaseList_t *const drb2release_list,
- const uint8_t security_modeP,
- uint8_t *const kRRCenc,
- uint8_t *const kRRCint,
- uint8_t *const kUPenc,
- uint8_t *const kUPint
- ,LTE_PMCH_InfoList_r9_t *pmch_InfoList_r9
- ,rb_id_t *const defaultDRB,
- struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list);
-
-extern rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP,
- const NR_SRB_ToAddModList_t * const srb2add_listP,
- const NR_DRB_ToAddModList_t * const drb2add_listP,
- const NR_DRB_ToReleaseList_t * const drb2release_listP,
- const LTE_PMCH_InfoList_r9_t * const pmch_InfoList_r9_pP,
- struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list);
-
static inline uint64_t bitStr_to_uint64(BIT_STRING_t *asn);
mui_t rrc_gNB_mui = 0;
@@ -187,6 +170,7 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration
rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts,
rrc->carrier.sib1_tda,
+ rrc->carrier.minRXTXTIME,
(NR_ServingCellConfigCommon_t *)rrc->carrier.servingcellconfigcommon,
&rrc->carrier.mib,
0,
@@ -300,6 +284,7 @@ void apply_macrlc_config(gNB_RRC_INST *rrc,
rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts,
rrc->carrier.sib1_tda,
+ rrc->carrier.minRXTXTIME,
NULL,
NULL,
0,
@@ -422,15 +407,6 @@ rrc_gNB_generate_RRCSetup(
LOG_D(NR_RRC,
PROTOCOL_NR_RRC_CTXT_UE_FMT" RRC_gNB --- MAC_CONFIG_REQ (SRB1) ---> MAC_gNB\n",
PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- ue_p->Srb0.Tx_buffer.Header, // LG WARNING
- ue_p->Srb0.Tx_buffer.payload_size,
- MSC_AS_TIME_FMT" RRCSetup UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- ue_p->Srb0.Tx_buffer.payload_size);
LOG_I(NR_RRC,
PROTOCOL_NR_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel DL-CCCH, Generating RRCSetup (bytes %d)\n",
PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
@@ -493,6 +469,7 @@ rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(
rrc_instance_p->carrier.pdsch_AntennaPorts,
rrc_instance_p->carrier.pusch_AntennaPorts,
rrc_instance_p->carrier.sib1_tda,
+ rrc_instance_p->carrier.minRXTXTIME,
(NR_ServingCellConfigCommon_t *)rrc_instance_p->carrier.servingcellconfigcommon,
&rrc_instance_p->carrier.mib,
0,
@@ -500,15 +477,6 @@ rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(
(NR_CellGroupConfig_t *)NULL
);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- ue_p->Srb0.Tx_buffer.Header, // LG WARNING
- ue_p->Srb0.Tx_buffer.payload_size,
- MSC_AS_TIME_FMT" RRCSetup UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- ue_p->Srb0.Tx_buffer.payload_size);
LOG_I(NR_RRC,
PROTOCOL_NR_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel DL-CCCH, Generating RRCSetup (bytes %d)\n",
PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
@@ -550,14 +518,6 @@ rrc_gNB_generate_RRCReject(
(char *)(ue_p->Srb0.Tx_buffer.Payload),
ue_p->Srb0.Tx_buffer.payload_size,
"[MSG] RRCReject \n");
- MSC_LOG_TX_MESSAGE(MSC_RRC_GNB,
- MSC_RRC_UE,
- ue_p->Srb0.Tx_buffer.Header,
- ue_p->Srb0.Tx_buffer.payload_size,
- MSC_AS_TIME_FMT" NR_RRCReject UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP == NULL ? -1 : ue_context_pP->ue_context.rnti,
- ue_p->Srb0.Tx_buffer.payload_size);
LOG_I(NR_RRC,
PROTOCOL_NR_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel DL-CCCH, Generating NR_RRCReject (bytes %d)\n",
PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
@@ -818,15 +778,6 @@ rrc_gNB_generate_defaultRRCReconfiguration(
rrc_gNB_mui,
ctxt_pP->module_id,
DCCH);
- MSC_LOG_TX_MESSAGE(MSC_RRC_GNB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" NR_RRCReconfiguration UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_gNB_mui,
- size);
nr_rrc_data_req(ctxt_pP,
DCCH,
rrc_gNB_mui++,
@@ -1049,16 +1000,176 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
LOG_D(NR_RRC,
"[FRAME %05d][RRC_gNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_gNB_mui, ctxt_pP->module_id, DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- buffer,
+
+#ifdef ITTI_SIM
+ MessageDef *message_p;
+ uint8_t *message_buffer;
+ message_buffer = itti_malloc (TASK_RRC_GNB_SIM, TASK_RRC_UE_SIM, size);
+ memcpy (message_buffer, buffer, size);
+ message_p = itti_alloc_new_message (TASK_RRC_GNB_SIM, 0, GNB_RRC_DCCH_DATA_IND);
+ GNB_RRC_DCCH_DATA_IND (message_p).rbid = DCCH;
+ GNB_RRC_DCCH_DATA_IND (message_p).sdu = message_buffer;
+ GNB_RRC_DCCH_DATA_IND (message_p).size = size;
+ itti_send_msg_to_task (TASK_RRC_UE_SIM, ctxt_pP->instance, message_p);
+#else
+ nr_rrc_data_req(
+ ctxt_pP,
+ DCCH,
+ rrc_gNB_mui++,
+ SDU_CONFIRM_NO,
size,
- MSC_AS_TIME_FMT" dedicated RRCReconfiguration UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_gNB_mui,
- size);
+ buffer,
+ PDCP_TRANSMISSION_MODE_CONTROL);
+#endif
+}
+
+//-----------------------------------------------------------------------------
+void
+rrc_gNB_modify_dedicatedRRCReconfiguration(
+ const protocol_ctxt_t *const ctxt_pP,
+ rrc_gNB_ue_context_t *ue_context_pP)
+//-----------------------------------------------------------------------------
+{
+ NR_DRB_ToAddMod_t *DRB_config = NULL;
+ NR_DRB_ToAddModList_t **DRB_configList = NULL;
+ NR_DRB_ToAddModList_t *DRB_configList2 = NULL;
+ struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList
+ *dedicatedNAS_MessageList = NULL;
+ NR_DedicatedNAS_Message_t *dedicatedNAS_Message = NULL;
+ uint8_t buffer[RRC_BUF_SIZE];
+ uint16_t size;
+ int qos_flow_index = 0;
+ int i, j;
+
+ uint8_t xid = rrc_gNB_get_next_transaction_identifier(ctxt_pP->module_id);
+ DRB_configList = &ue_context_pP->ue_context.DRB_configList;
+
+ DRB_configList2 = CALLOC(1, sizeof(NR_DRB_ToAddModList_t));
+ memset(DRB_configList2, 0, sizeof(NR_DRB_ToAddModList_t));
+
+ dedicatedNAS_MessageList = CALLOC(1, sizeof(struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList));
+
+ for (i = 0; i < ue_context_pP->ue_context.nb_of_modify_pdusessions; i++) {
+ // bypass the new and already configured pdu sessions
+ if (ue_context_pP->ue_context.modify_pdusession[i].status >= PDU_SESSION_STATUS_DONE) {
+ ue_context_pP->ue_context.modify_pdusession[i].xid = xid;
+ continue;
+ }
+
+ if (ue_context_pP->ue_context.modify_pdusession[i].cause != NGAP_CAUSE_NOTHING) {
+ // set xid of failure pdu session
+ ue_context_pP->ue_context.modify_pdusession[i].xid = xid;
+ ue_context_pP->ue_context.modify_pdusession[i].status = PDU_SESSION_STATUS_FAILED;
+ continue;
+ }
+
+ // search exist DRB_config
+ for (j = 0; j < (*DRB_configList)->list.count; j++) {
+ if ((*DRB_configList)->list.array[j]->cnAssociation->choice.sdap_Config->pdu_Session ==
+ ue_context_pP->ue_context.modify_pdusession[i].param.pdusession_id) {
+ DRB_config = (*DRB_configList)->list.array[j];
+ break;
+ }
+ }
+
+ if (DRB_config == NULL) {
+ ue_context_pP->ue_context.modify_pdusession[i].xid = xid;
+ ue_context_pP->ue_context.modify_pdusession[i].status = PDU_SESSION_STATUS_FAILED;
+ ue_context_pP->ue_context.modify_pdusession[i].cause = NGAP_CAUSE_RADIO_NETWORK;
+ ue_context_pP->ue_context.modify_pdusession[i].cause_value = NGAP_CauseRadioNetwork_unspecified;
+ ue_context_pP->ue_context.nb_of_failed_pdusessions++;
+ continue;
+ }
+
+ // Reference TS23501 Table 5.7.4-1: Standardized 5QI to QoS characteristics mapping
+ for (qos_flow_index = 0; qos_flow_index < ue_context_pP->ue_context.modify_pdusession[i].param.nb_qos; qos_flow_index++) {
+ switch (ue_context_pP->ue_context.modify_pdusession[i].param.qos[qos_flow_index].fiveQI) {
+ case 1: //100ms
+ case 2: //150ms
+ case 3: //50ms
+ case 4: //300ms
+ case 5: //100ms
+ case 6: //300ms
+ case 7: //100ms
+ case 8: //300ms
+ case 9: //300ms Video (Buffered Streaming)TCP-based (e.g., www, e-mail, chat, ftp, p2p file sharing, progressive video, etc.)
+ // TODO
+ break;
+
+ default:
+ LOG_E(NR_RRC,"not supported 5qi %lu\n", ue_context_pP->ue_context.modify_pdusession[i].param.qos[qos_flow_index].fiveQI);
+ ue_context_pP->ue_context.modify_pdusession[i].status = PDU_SESSION_STATUS_FAILED;
+ ue_context_pP->ue_context.modify_pdusession[i].xid = xid;
+ ue_context_pP->ue_context.modify_pdusession[i].cause = NGAP_CAUSE_RADIO_NETWORK;
+ ue_context_pP->ue_context.modify_pdusession[i].cause_value = NGAP_CauseRadioNetwork_not_supported_5QI_value;
+ ue_context_pP->ue_context.nb_of_failed_pdusessions++;
+ continue;
+ }
+
+ LOG_I(NR_RRC, "PDU SESSION ID %ld, DRB ID %ld (index %d), QOS flow %d, 5QI %ld \n",
+ DRB_config->cnAssociation->choice.sdap_Config->pdu_Session,
+ DRB_config->drb_Identity, i,
+ qos_flow_index,
+ ue_context_pP->ue_context.modify_pdusession[i].param.qos[qos_flow_index].fiveQI
+ );
+ }
+
+ ASN_SEQUENCE_ADD(&DRB_configList2->list, DRB_config);
+
+ ue_context_pP->ue_context.modify_pdusession[i].status = PDU_SESSION_STATUS_DONE;
+ ue_context_pP->ue_context.modify_pdusession[i].xid = xid;
+
+ if (ue_context_pP->ue_context.modify_pdusession[i].param.nas_pdu.buffer != NULL) {
+ dedicatedNAS_Message = CALLOC(1, sizeof(NR_DedicatedNAS_Message_t));
+ memset(dedicatedNAS_Message, 0, sizeof(OCTET_STRING_t));
+ OCTET_STRING_fromBuf(dedicatedNAS_Message,
+ (char *)ue_context_pP->ue_context.modify_pdusession[i].param.nas_pdu.buffer,
+ ue_context_pP->ue_context.modify_pdusession[i].param.nas_pdu.length);
+ ASN_SEQUENCE_ADD(&dedicatedNAS_MessageList->list, dedicatedNAS_Message);
+
+ LOG_I(NR_RRC,"add NAS info with size %d (pdusession id %d)\n",ue_context_pP->ue_context.pduSession[i].param.nas_pdu.length,
+ ue_context_pP->ue_context.modify_pdusession[i].param.pdusession_id);
+ } else {
+ // TODO
+ LOG_E(NR_RRC,"no NAS info (pdusession id %d)\n", ue_context_pP->ue_context.modify_pdusession[i].param.pdusession_id);
+ }
+ }
+
+ /* If list is empty free the list and reset the address */
+ if (dedicatedNAS_MessageList->list.count == 0) {
+ free(dedicatedNAS_MessageList);
+ dedicatedNAS_MessageList = NULL;
+ }
+
+ memset(buffer, 0, sizeof(buffer));
+ size = do_RRCReconfiguration(ctxt_pP, buffer, sizeof(buffer),
+ xid,
+ NULL,
+ DRB_configList2,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ dedicatedNAS_MessageList,
+ NULL,
+ NULL);
+ LOG_DUMPMSG(NR_RRC, DEBUG_RRC, (char *)buffer, size, "[MSG] RRC Reconfiguration\n");
+
+ /* Free all NAS PDUs */
+ for (i = 0; i < ue_context_pP->ue_context.nb_of_modify_pdusessions; i++) {
+ if (ue_context_pP->ue_context.modify_pdusession[i].param.nas_pdu.buffer != NULL) {
+ /* Free the NAS PDU buffer and invalidate it */
+ free(ue_context_pP->ue_context.modify_pdusession[i].param.nas_pdu.buffer);
+ ue_context_pP->ue_context.modify_pdusession[i].param.nas_pdu.buffer = NULL;
+ }
+ }
+
+ LOG_I(NR_RRC,
+ "[gNB %d] Frame %d, Logical Channel DL-DCCH, Generate RRCReconfiguration (bytes %d, UE RNTI %x)\n",
+ ctxt_pP->module_id, ctxt_pP->frame, size, ue_context_pP->ue_context.rnti);
+ LOG_D(NR_RRC,
+ "[FRAME %05d][RRC_gNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
+ ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_gNB_mui, ctxt_pP->module_id, DCCH);
#ifdef ITTI_SIM
MessageDef *message_p;
@@ -1157,16 +1268,6 @@ rrc_gNB_generate_dedicatedRRCReconfiguration_release(
LOG_D(NR_RRC,
"[FRAME %05d][RRC_gNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_gNB_mui, ctxt_pP->module_id, DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" dedicated NR_RRCReconfiguration UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_gNB_mui,
- size);
#ifdef ITTI_SIM
MessageDef *message_p;
uint8_t *message_buffer;
@@ -1231,9 +1332,6 @@ rrc_gNB_process_RRCReconfigurationComplete(
ue_context_pP->ue_context.kgnb,
&kRRCint);
/* Refresh SRBs/DRBs */
- MSC_LOG_TX_MESSAGE(MSC_RRC_GNB, MSC_PDCP_ENB, NULL, 0, MSC_AS_TIME_FMT" CONFIG_REQ UE %x DRB (security unchanged)",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti);
#ifndef ITTI_SIM
LOG_D(NR_RRC,"Configuring PDCP DRBs/SRBs for UE %x\n",ue_context_pP->ue_context.rnti);
@@ -1259,6 +1357,7 @@ rrc_gNB_process_RRCReconfigurationComplete(
rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts,
rrc->carrier.sib1_tda,
+ rrc->carrier.minRXTXTIME,
NULL,
NULL,
0,
@@ -1461,14 +1560,6 @@ rrc_gNB_generate_RRCReestablishment(
}
} // if (*SRB_configList != NULL)
- MSC_LOG_TX_MESSAGE(MSC_RRC_GNB,
- MSC_RRC_UE,
- ue_context->Srb0.Tx_buffer.Header,
- ue_context->Srb0.Tx_buffer.payload_size,
- MSC_AS_TIME_FMT" NR_RRCReestablishment UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context->rnti,
- ue_context->Srb0.Tx_buffer.payload_size);
LOG_I(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel DL-DCCH, Generating NR_RRCReestablishment (bytes %d)\n",
PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
ue_context->Srb0.Tx_buffer.payload_size);
@@ -1731,16 +1822,6 @@ rrc_gNB_process_RRCConnectionReestablishmentComplete(
LOG_D(NR_RRC,
"[FRAME %05d][RRC_gNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_gNB_mui, ctxt_pP->module_id, DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" LTE_RRCConnectionReconfiguration UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_gNB_mui,
- size);
#ifdef ITTI_SIM
MessageDef *message_p;
uint8_t *message_buffer;
@@ -1811,15 +1892,6 @@ int nr_rrc_gNB_decode_ccch(protocol_ctxt_t *const ctxt_pP,
ue_context_p = rrc_gNB_get_ue_context(gnb_rrc_inst, ctxt_pP->rnti);
if (ue_context_p != NULL) {
rrc_gNB_free_mem_UE_context(ctxt_pP, ue_context_p);
- MSC_LOG_RX_DISCARDED_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- buffer,
- dec_rval.consumed,
- MSC_AS_TIME_FMT" NR_RRCSetupRequest UE %x size %u (UE already in context)",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- dec_rval.consumed);
} else {
rrcSetupRequest = &ul_ccch_msg->message.choice.c1->choice.rrcSetupRequest->rrcSetupRequest;
if (NR_InitialUE_Identity_PR_randomValue == rrcSetupRequest->ue_Identity.present) {
@@ -2111,13 +2183,6 @@ int nr_rrc_gNB_decode_ccch(protocol_ctxt_t *const ctxt_pP,
LOG_I(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT"CALLING RLC CONFIG SRB1 (rbid %d)\n",
PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
Idx);
- MSC_LOG_TX_MESSAGE(MSC_RRC_GNB,
- MSC_PDCP_GNB,
- NULL,
- 0,
- MSC_AS_TIME_FMT" CONFIG_REQ UE %x SRB",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti);
// nr_rrc_pdcp_config_asn1_req(ctxt_pP,
// ue_context_p->ue_context.SRB_configList,
// NULL,
@@ -2192,7 +2257,6 @@ rrc_gNB_decode_dcch(
asn_dec_rval_t dec_rval;
NR_UL_DCCH_Message_t *ul_dcch_msg = NULL;
struct rrc_gNB_ue_context_s *ue_context_p = NULL;
- MessageDef *msg_delete_tunnels_p = NULL;
uint8_t xid;
int i;
@@ -2261,15 +2325,6 @@ rrc_gNB_decode_dcch(
LOG_DUMPMSG(NR_RRC, DEBUG_RRC, (char *)(Rx_sdu), sdu_sizeP,
"[MSG] RRC Connection Reconfiguration Complete\n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" NR_RRCReconfigurationComplete UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
LOG_D(NR_RRC,
PROTOCOL_NR_RRC_CTXT_UE_FMT" RLC RB %02d --- RLC_DATA_IND %d bytes "
"(RRCReconfigurationComplete) ---> RRC_gNB]\n",
@@ -2291,28 +2346,37 @@ rrc_gNB_decode_dcch(
xid = ul_dcch_msg->message.choice.c1->choice.rrcReconfigurationComplete->rrc_TransactionIdentifier;
ue_context_p->ue_context.pdu_session_release_command_flag = 0;
//gtp tunnel delete
- msg_delete_tunnels_p = itti_alloc_new_message(TASK_RRC_GNB, 0, GTPV1U_GNB_DELETE_TUNNEL_REQ);
- memset(>PV1U_GNB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p), 0, sizeof(GTPV1U_GNB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p)));
- GTPV1U_GNB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p).rnti = ue_context_p->ue_context.rnti;
-
+ gtpv1u_gnb_delete_tunnel_req_t req={0};
for(i = 0; i < NB_RB_MAX; i++) {
if(xid == ue_context_p->ue_context.pduSession[i].xid) {
- GTPV1U_GNB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p).pdusession_id[GTPV1U_GNB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p).num_pdusession++] =
+ req.pdusession_id[req.num_pdusession++] =
ue_context_p->ue_context.gnb_gtp_psi[i];
ue_context_p->ue_context.gnb_gtp_teid[i] = 0;
memset(&ue_context_p->ue_context.gnb_gtp_addrs[i], 0, sizeof(ue_context_p->ue_context.gnb_gtp_addrs[i]));
ue_context_p->ue_context.gnb_gtp_psi[i] = 0;
}
}
-
- itti_send_msg_to_task(TASK_GTPV1_U, ctxt_pP->instance, msg_delete_tunnels_p);
+ gtpv1u_delete_ngu_tunnel(ctxt_pP->instance, &req);
//NGAP_PDUSESSION_RELEASE_RESPONSE
rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE(ctxt_pP, ue_context_p, xid);
} else if (ue_context_p->ue_context.established_pdu_sessions_flag != 1) {
- if (ue_context_p->ue_context.setup_pdu_sessions > 0) {
+ if (ue_context_p->ue_context.nb_of_pdusessions > 0) {
rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP(ctxt_pP,
ue_context_p,
ul_dcch_msg->message.choice.c1->choice.rrcReconfigurationComplete->rrc_TransactionIdentifier);
+ ue_context_p->ue_context.nb_of_pdusessions = 0;
+ }
+ }
+ if (ue_context_p->ue_context.nb_of_modify_pdusessions > 0) {
+ rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(ctxt_pP,
+ ue_context_p,
+ ul_dcch_msg->message.choice.c1->choice.rrcReconfigurationComplete->rrc_TransactionIdentifier);
+ ue_context_p->ue_context.nb_of_modify_pdusessions = 0;
+ ue_context_p->ue_context.nb_of_failed_pdusessions = 0;
+ memset(ue_context_p->ue_context.modify_pdusession, 0, sizeof(ue_context_p->ue_context.modify_pdusession));
+
+ for(int i = 0; i < NR_NB_RB_MAX; i++) {
+ ue_context_p->ue_context.modify_pdusession[i].xid = -1;
}
}
}
@@ -2331,15 +2395,6 @@ rrc_gNB_decode_dcch(
LOG_DUMPMSG(NR_RRC, DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
"[MSG] RRC SetupComplete\n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" NR_RRCSetupComplete UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
LOG_D(NR_RRC,
PROTOCOL_NR_RRC_CTXT_UE_FMT" RLC RB %02d --- RLC_DATA_IND %d bytes "
"(RRCSetupComplete) ---> RRC_gNB\n",
@@ -2418,15 +2473,6 @@ rrc_gNB_decode_dcch(
LOG_D(NR_RRC,"[MSG] RRC UL Information Transfer \n");
LOG_DUMPMSG(RRC,DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
"[MSG] RRC UL Information Transfer \n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" ulInformationTransfer UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
if (AMF_MODE_ENABLED == 1) {
rrc_gNB_send_NGAP_UPLINK_NAS(ctxt_pP,
@@ -2466,15 +2512,6 @@ rrc_gNB_decode_dcch(
case NR_UL_DCCH_MessageType__c1_PR_securityModeFailure:
LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
"[MSG] NR RRC Security Mode Failure\n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" securityModeFailure UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
LOG_W(NR_RRC,
PROTOCOL_RRC_CTXT_UE_FMT" RLC RB %02d --- RLC_DATA_IND %d bytes "
"(securityModeFailure) ---> RRC_gNB\n",
@@ -2497,15 +2534,6 @@ rrc_gNB_decode_dcch(
LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
"[MSG] NR_RRC UECapablility Information\n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" ueCapabilityInformation UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
LOG_I(NR_RRC,
PROTOCOL_NR_RRC_CTXT_UE_FMT" received ueCapabilityInformation on UL-DCCH %d from UE\n",
PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
@@ -2611,15 +2639,6 @@ rrc_gNB_decode_dcch(
case NR_UL_DCCH_MessageType__c1_PR_rrcReestablishmentComplete:
LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
"[MSG] NR_RRC Connection Reestablishment Complete\n");
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- Rx_sdu,
- sdu_sizeP,
- MSC_AS_TIME_FMT" NR_RRCConnectionReestablishmentComplete UE %x size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->ue_context.rnti,
- sdu_sizeP);
LOG_I(NR_RRC,
PROTOCOL_RRC_CTXT_UE_FMT" RLC RB %02d --- RLC_DATA_IND %d bytes "
"(rrcConnectionReestablishmentComplete) ---> RRC_gNB\n",
@@ -3635,11 +3654,12 @@ void *rrc_gnb_task(void *args_p) {
rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(msg_p, msg_name_p, instance);
break;
- case NGAP_PDUSESSION_RELEASE_COMMAND:
- rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(msg_p, msg_name_p, instance);
+ case NGAP_PDUSESSION_MODIFY_REQ:
+ rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(msg_p, msg_name_p, instance);
break;
- case GTPV1U_GNB_DELETE_TUNNEL_RESP:
+ case NGAP_PDUSESSION_RELEASE_COMMAND:
+ rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(msg_p, msg_name_p, instance);
break;
/* Messages from gNB app */
@@ -3691,11 +3711,6 @@ void *rrc_gnb_task(void *args_p) {
rrc_gNB_process_dc_overall_timeout(GNB_INSTANCE_TO_MODULE_ID(instance), &X2AP_ENDC_DC_OVERALL_TIMEOUT(msg_p));
break;
- /* Messages from GTP */
- case GTPV1U_ENB_DELETE_TUNNEL_RESP:
- /* nothing to do? */
- break;
-
case NGAP_UE_CONTEXT_RELEASE_REQ:
rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_REQ(msg_p, msg_name_p, instance);
break;
@@ -3769,16 +3784,6 @@ rrc_gNB_generate_SecurityModeCommand(
size,
rrc_gNB_mui,
DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" securityModeCommand UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_gNB_mui,
- size);
#ifdef ITTI_SIM
MessageDef *message_p;
uint8_t *message_buffer;
@@ -3851,16 +3856,6 @@ rrc_gNB_generate_UECapabilityEnquiry(
size,
rrc_gNB_mui,
DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" rrcNRUECapabilityEnquiry UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_gNB_mui,
- size);
#ifdef ITTI_SIM
MessageDef *message_p;
uint8_t *message_buffer;
@@ -3920,16 +3915,6 @@ rrc_gNB_generate_RRCRelease(
size,
rrc_gNB_mui,
DCCH);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_GNB,
- MSC_RRC_UE,
- buffer,
- size,
- MSC_AS_TIME_FMT" NR_RRCRelease UE %x MUI %d size %u",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_context.rnti,
- rrc_gNB_mui,
- size);
#ifdef ITTI_SIM
MessageDef *message_p;
diff --git a/openair2/RRC/NR/rrc_gNB_GTPV1U.c b/openair2/RRC/NR/rrc_gNB_GTPV1U.c
index 293f9e8b9fc787215bca85bca2452f98d7d07b14..f7b491af14f0364bf2e0726213d3984781bf7734 100644
--- a/openair2/RRC/NR/rrc_gNB_GTPV1U.c
+++ b/openair2/RRC/NR/rrc_gNB_GTPV1U.c
@@ -32,7 +32,6 @@
# include "RRC/LTE/MESSAGES/asn1_msg.h"
# include "rrc_eNB_GTPV1U.h"
# include "rrc_eNB_UE_context.h"
-# include "msc.h"
# include "openair2/RRC/NR/rrc_gNB_UE_context.h"
//# if defined(ENABLE_ITTI)
@@ -77,15 +76,6 @@ rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(
create_tunnel_resp_pP->enb_addr.length);
}
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_ENB,
- MSC_GTPU_ENB,
- NULL,0,
- MSC_AS_TIME_FMT" CREATE_TUNNEL_RESP RNTI %"PRIx16" ntuns %u ebid %u enb-s1u teid %u",
- 0,0,rnti,
- create_tunnel_resp_pP->num_tunnels,
- ue_context_p->ue_context.gnb_gtp_ebi[0],
- ue_context_p->ue_context.gnb_gtp_teid[0]);
(void)rnti; /* avoid gcc warning "set but not used" */
return 0;
} else {
@@ -126,15 +116,6 @@ nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(
create_tunnel_resp_pP->gnb_addr.length);
}
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_GNB,
- MSC_GTPU_GNB,
- NULL,0,
- MSC_AS_TIME_FMT" CREATE_TUNNEL_RESP RNTI %"PRIx16" ntuns %u psid %u enb-s1u teid %u",
- 0,0,rnti,
- create_tunnel_resp_pP->num_tunnels,
- ue_context_p->ue_context.gnb_gtp_psi[0],
- ue_context_p->ue_context.gnb_gtp_teid[0]);
(void)rnti; /* avoid gcc warning "set but not used" */
return 0;
} else {
diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.c b/openair2/RRC/NR/rrc_gNB_NGAP.c
index 043d136604582415d6239ac67a54219a412a1e09..4286ea0d62d1fc67c6c26717a79af498f5bb2b01 100644
--- a/openair2/RRC/NR/rrc_gNB_NGAP.c
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.c
@@ -33,17 +33,15 @@
#include "rrc_eNB_S1AP.h"
#include "gnb_config.h"
#include "common/ran_context.h"
-#include "gtpv1u.h"
#include "asn1_conversions.h"
#include "intertask_interface.h"
#include "pdcp.h"
#include "pdcp_primitives.h"
-#include "msc.h"
-
#include "gtpv1u_eNB_task.h"
#include "gtpv1u_gNB_task.h"
+#include <openair3/ocp-gtpu/gtp_itf.h>
#include "RRC/LTE/rrc_eNB_GTPV1U.h"
#include "RRC/NR/rrc_gNB_GTPV1U.h"
@@ -453,14 +451,6 @@ rrc_gNB_send_NGAP_NAS_FIRST_REQ(
ue_context_pP->ue_context.ue_guami.amf_set_id = NGAP_NAS_FIRST_REQ(message_p).ue_identity.guami.amf_set_id;
ue_context_pP->ue_context.ue_guami.amf_pointer = NGAP_NAS_FIRST_REQ(message_p).ue_identity.guami.amf_pointer;
- MSC_LOG_TX_MESSAGE(MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- (const char *)&message_p->ittiMsg.ngap_nas_first_req,
- sizeof(ngap_nas_first_req_t),
- MSC_AS_TIME_FMT" NGAP_NAS_FIRST_REQ gNB %u UE %x",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ctxt_pP->module_id,
- ctxt_pP->rnti);
LOG_I(NGAP, "[gNB %d] Build NGAP_NAS_FIRST_REQ adding in s_TMSI: GUAMI amf_set_id %u amf_region_id %u ue %x\n",
ctxt_pP->module_id,
NGAP_NAS_FIRST_REQ (message_p).ue_identity.guami.amf_set_id,
@@ -636,16 +626,6 @@ rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP(
}
}
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_GNB,
- MSC_S1AP_ENB,
- (const char *)&NGAP_INITIAL_CONTEXT_SETUP_RESP (msg_p),
- sizeof(ngap_initial_context_setup_resp_t),
- MSC_AS_TIME_FMT" INITIAL_CONTEXT_SETUP_RESP UE %X eNB_ue_s1ap_id %u e_rabs:%u succ %u fail",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_id_rnti,
- NGAP_INITIAL_CONTEXT_SETUP_RESP (msg_p).gNB_ue_ngap_id,
- pdu_sessions_done, pdu_sessions_failed);
NGAP_INITIAL_CONTEXT_SETUP_RESP (msg_p).nb_of_pdusessions = pdu_sessions_done;
NGAP_INITIAL_CONTEXT_SETUP_RESP (msg_p).nb_of_pdusessions_failed = pdu_sessions_failed;
itti_send_msg_to_task (TASK_NGAP, ctxt_pP->instance, msg_p);
@@ -794,15 +774,6 @@ rrc_gNB_process_NGAP_DOWNLINK_NAS(
gNB_ue_ngap_id);
if (ue_context_p == NULL) {
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_GNB,
- MSC_NGAP_GNB,
- NULL,
- 0,
- MSC_AS_TIME_FMT" DOWNLINK-NAS UE initial id %u gNB_ue_ngap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_initial_id,
- gNB_ue_ngap_id);
/* Can not associate this message to an UE index, send a failure to NGAP and discard it! */
MessageDef *msg_fail_p;
LOG_W(NR_RRC, "[gNB %ld] In NGAP_DOWNLINK_NAS: unknown UE from NGAP ids (%d, %u)\n", instance, ue_initial_id, gNB_ue_ngap_id);
@@ -811,15 +782,6 @@ rrc_gNB_process_NGAP_DOWNLINK_NAS(
NGAP_NAS_NON_DELIVERY_IND (msg_fail_p).nas_pdu.length = NGAP_DOWNLINK_NAS (msg_p).nas_pdu.length;
NGAP_NAS_NON_DELIVERY_IND (msg_fail_p).nas_pdu.buffer = NGAP_DOWNLINK_NAS (msg_p).nas_pdu.buffer;
// TODO add failure cause when defined!
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_ENB,
- MSC_NGAP_GNB,
- (const char *)NULL,
- 0,
- MSC_AS_TIME_FMT" NGAP_NAS_NON_DELIVERY_IND UE initial id %u gNB_ue_ngap_id %u (ue ctxt !found)",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_initial_id,
- gNB_ue_ngap_id);
itti_send_msg_to_task (TASK_NGAP, instance, msg_fail_p);
return (-1);
} else {
@@ -830,15 +792,6 @@ rrc_gNB_process_NGAP_DOWNLINK_NAS(
ue_context_p->ue_context.gNB_ue_ngap_id = NGAP_DOWNLINK_NAS (msg_p).gNB_ue_ngap_id;
}
- MSC_LOG_RX_MESSAGE(
- MSC_RRC_GNB,
- MSC_NGAP_GNB,
- (const char *)NULL,
- 0,
- MSC_AS_TIME_FMT" DOWNLINK-NAS UE initial id %u gNB_ue_ngap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_initial_id,
- NGAP_DOWNLINK_NAS (msg_p).gNB_ue_ngap_id);
/* Create message for PDCP (DLInformationTransfer_t) */
length = do_NR_DLInformationTransfer (
instance,
@@ -997,16 +950,6 @@ rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP(
if ((pdu_sessions_done > 0) ) {
LOG_I(NR_RRC,"NGAP_PDUSESSION_SETUP_RESP: sending the message: nb_of_pdusessions %d, total pdu_sessions %d, index %d\n",
ue_context_pP->ue_context.nb_of_pdusessions, ue_context_pP->ue_context.setup_pdu_sessions, pdusession);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_GNB,
- MSC_NGAP_GNB,
- (const char *)&NGAP_PDUSESSION_SETUP_RESP (msg_p),
- sizeof(ngap_pdusession_setup_resp_t),
- MSC_AS_TIME_FMT" PDUSESSION_SETUP_RESP UE %X gNB_ue_ngap_id %u pdu_sessions:%u succ %u fail",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_pP->ue_id_rnti,
- NGAP_PDUSESSION_SETUP_RESP (msg_p).gNB_ue_ngap_id,
- pdu_sessions_done, pdu_sessions_failed);
itti_send_msg_to_task (TASK_NGAP, ctxt_pP->instance, msg_p);
}
@@ -1115,6 +1058,264 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
}
}
+//------------------------------------------------------------------------------
+int
+rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
+ MessageDef *msg_p,
+ const char *msg_name,
+ instance_t instance
+)
+//------------------------------------------------------------------------------
+{
+ uint16_t ue_initial_id;
+ uint32_t gNB_ue_ngap_id;
+ uint8_t nb_pdusessions_tomodify;
+ rrc_gNB_ue_context_t *ue_context_p = NULL;
+ uint8_t i;
+ uint8_t qos_flow_index;
+ protocol_ctxt_t ctxt;
+
+ ue_initial_id = NGAP_PDUSESSION_MODIFY_REQ(msg_p).ue_initial_id;
+ gNB_ue_ngap_id = NGAP_PDUSESSION_MODIFY_REQ(msg_p).gNB_ue_ngap_id;
+ nb_pdusessions_tomodify = NGAP_PDUSESSION_MODIFY_REQ(msg_p).nb_pdusessions_tomodify;
+
+ ue_context_p = rrc_gNB_get_ue_context_from_ngap_ids(instance, ue_initial_id, gNB_ue_ngap_id);
+ if (ue_context_p == NULL) {
+ LOG_W(NR_RRC, "[gNB %ld] In NGAP_PDUSESSION_MODIFY_REQ: unknown UE from NGAP ids (%d, %u)\n", instance, ue_initial_id, gNB_ue_ngap_id);
+ // TODO
+ return (-1);
+ } else {
+ PROTOCOL_CTXT_SET_BY_INSTANCE(&ctxt, instance, GNB_FLAG_YES, ue_context_p->ue_context.rnti, 0, 0);
+ ctxt.eNB_index = 0;
+
+ ue_context_p->ue_context.gNB_ue_ngap_id = gNB_ue_ngap_id;
+ {
+ int j;
+ boolean_t is_treated[NGAP_MAX_PDUSESSION] = {FALSE};
+ uint8_t nb_of_failed_pdusessions = 0;
+
+ for (i = 0; i < nb_pdusessions_tomodify; i++) {
+ if (is_treated[i] == TRUE) {
+ continue;
+ }
+
+ //Check if same PDU session ID to handle multiple pdu sessions
+ for (j = i+1; j < nb_pdusessions_tomodify; j++) {
+ if (is_treated[j] == FALSE &&
+ NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[j].pdusession_id ==
+ NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].pdusession_id) {
+ // handle multiple pdu session id
+ LOG_D(NR_RRC, "handle multiple pdu session id \n");
+ ue_context_p->ue_context.modify_pdusession[j].status = PDU_SESSION_STATUS_NEW;
+ ue_context_p->ue_context.modify_pdusession[j].param.pdusession_id =
+ NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[j].pdusession_id;
+ ue_context_p->ue_context.modify_pdusession[j].cause = NGAP_CAUSE_RADIO_NETWORK;
+ ue_context_p->ue_context.modify_pdusession[j].cause_value = NGAP_CauseRadioNetwork_multiple_PDU_session_ID_instances;
+ nb_of_failed_pdusessions++;
+ is_treated[i] = TRUE;
+ is_treated[j] = TRUE;
+ }
+ }
+ // handle multiple pdu session id case
+ if (is_treated[i] == TRUE) {
+ LOG_D(NR_RRC, "handle multiple pdu session id \n");
+ ue_context_p->ue_context.modify_pdusession[i].status = PDU_SESSION_STATUS_NEW;
+ ue_context_p->ue_context.modify_pdusession[i].param.pdusession_id =
+ NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].pdusession_id;
+ ue_context_p->ue_context.modify_pdusession[i].cause = NGAP_CAUSE_RADIO_NETWORK;
+ ue_context_p->ue_context.modify_pdusession[i].cause_value = NGAP_CauseRadioNetwork_multiple_PDU_session_ID_instances;
+ nb_of_failed_pdusessions++;
+ continue;
+ }
+
+ // Check pdu session ID is established
+ for (j = 0; j < NR_NB_RB_MAX -3; j++) {
+ if (ue_context_p->ue_context.pduSession[j].param.pdusession_id ==
+ NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].pdusession_id) {
+ if (ue_context_p->ue_context.pduSession[j].status == PDU_SESSION_STATUS_TORELEASE ||
+ ue_context_p->ue_context.pduSession[j].status == PDU_SESSION_STATUS_DONE) {
+ break;
+ }
+ // Found established pdu session, prepare to send RRC message
+ ue_context_p->ue_context.modify_pdusession[i].status = PDU_SESSION_STATUS_NEW;
+ ue_context_p->ue_context.modify_pdusession[i].param.pdusession_id =
+ NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].pdusession_id;
+ ue_context_p->ue_context.modify_pdusession[i].cause = NGAP_CAUSE_NOTHING;
+ if (NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].nas_pdu.buffer != NULL) {
+ ue_context_p->ue_context.modify_pdusession[i].param.nas_pdu.buffer =
+ NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].nas_pdu.buffer;
+ ue_context_p->ue_context.modify_pdusession[i].param.nas_pdu.length =
+ NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].nas_pdu.length;
+ }
+ // Save new pdu session parameters, qos, upf addr, teid
+ for (qos_flow_index = 0; qos_flow_index < NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].nb_qos; qos_flow_index++) {
+ ue_context_p->ue_context.modify_pdusession[i].param.qos[qos_flow_index] =
+ NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].qos[qos_flow_index];
+ }
+ ue_context_p->ue_context.modify_pdusession[i].param.nb_qos =
+ NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].nb_qos;
+
+ ue_context_p->ue_context.modify_pdusession[i].param.upf_addr =
+ ue_context_p->ue_context.pduSession[j].param.upf_addr;
+ ue_context_p->ue_context.modify_pdusession[i].param.gtp_teid =
+ ue_context_p->ue_context.pduSession[j].param.gtp_teid;
+
+ is_treated[i] = TRUE;
+ break;
+ }
+ }
+
+ // handle Unknown pdu session ID
+ if (is_treated[i] == FALSE) {
+ LOG_D(NR_RRC, "handle Unknown pdu session ID \n");
+ ue_context_p->ue_context.modify_pdusession[i].status = PDU_SESSION_STATUS_NEW;
+ ue_context_p->ue_context.modify_pdusession[i].param.pdusession_id =
+ NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].pdusession_id;
+ ue_context_p->ue_context.modify_pdusession[i].cause = NGAP_CAUSE_RADIO_NETWORK;
+ ue_context_p->ue_context.modify_pdusession[i].cause_value = NGAP_CauseRadioNetwork_unknown_PDU_session_ID;
+ nb_of_failed_pdusessions++;
+ is_treated[i] = TRUE;
+ }
+ }
+
+ ue_context_p->ue_context.nb_of_modify_pdusessions = nb_pdusessions_tomodify;
+ ue_context_p->ue_context.nb_of_failed_pdusessions = nb_of_failed_pdusessions;
+ }
+
+ if (ue_context_p->ue_context.nb_of_failed_pdusessions < ue_context_p->ue_context.nb_of_modify_pdusessions) {
+ LOG_D(NR_RRC, "generate RRCReconfiguration \n");
+ rrc_gNB_modify_dedicatedRRCReconfiguration(&ctxt, ue_context_p);
+ } else { // all pdu modification failed
+ LOG_I(NR_RRC, "pdu session modify failed, fill NGAP_PDUSESSION_MODIFY_RESP with the pdu session information that failed to modify \n");
+ uint8_t nb_of_pdu_sessions_failed = 0;
+ MessageDef *msg_fail_p = NULL;
+ msg_fail_p = itti_alloc_new_message (TASK_RRC_GNB, 0, NGAP_PDUSESSION_MODIFY_RESP);
+ if (msg_fail_p == NULL) {
+ LOG_E(NR_RRC, "itti_alloc_new_message failed, msg_fail_p is NULL \n");
+ return (-1);
+ }
+
+ NGAP_PDUSESSION_MODIFY_RESP(msg_fail_p).gNB_ue_ngap_id = gNB_ue_ngap_id;
+ NGAP_PDUSESSION_MODIFY_RESP(msg_fail_p).nb_of_pdusessions = 0;
+
+ for (nb_of_pdu_sessions_failed = 0; nb_of_pdu_sessions_failed < ue_context_p->ue_context.nb_of_failed_pdusessions; nb_of_pdu_sessions_failed++) {
+ NGAP_PDUSESSION_MODIFY_RESP(msg_fail_p).pdusessions_failed[nb_of_pdu_sessions_failed].pdusession_id =
+ ue_context_p->ue_context.modify_pdusession[nb_of_pdu_sessions_failed].param.pdusession_id;
+ NGAP_PDUSESSION_MODIFY_RESP(msg_fail_p).pdusessions_failed[nb_of_pdu_sessions_failed].cause =
+ ue_context_p->ue_context.modify_pdusession[nb_of_pdu_sessions_failed].cause;
+ NGAP_PDUSESSION_MODIFY_RESP(msg_fail_p).pdusessions_failed[nb_of_pdu_sessions_failed].cause_value =
+ ue_context_p->ue_context.modify_pdusession[nb_of_pdu_sessions_failed].cause_value;
+ }
+
+ NGAP_PDUSESSION_MODIFY_RESP(msg_fail_p).nb_of_pdusessions_failed =
+ ue_context_p->ue_context.nb_of_failed_pdusessions;
+ itti_send_msg_to_task(TASK_NGAP, instance, msg_fail_p);
+ ue_context_p->ue_context.nb_of_modify_pdusessions = 0;
+ ue_context_p->ue_context.nb_of_failed_pdusessions = 0;
+ memset(ue_context_p->ue_context.modify_pdusession, 0, sizeof(ue_context_p->ue_context.modify_pdusession));
+ return (0);
+ }
+ }
+ return 0;
+}
+
+//------------------------------------------------------------------------------
+int
+rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(
+ const protocol_ctxt_t *const ctxt_pP,
+ rrc_gNB_ue_context_t *const ue_context_pP,
+ uint8_t xid
+)
+//------------------------------------------------------------------------------
+{
+ MessageDef *msg_p = NULL;
+ int i, j;
+ uint8_t qos_flow_index;
+ uint8_t pdu_sessions_failed = 0;
+ uint8_t pdu_sessions_done = 0;
+
+ msg_p = itti_alloc_new_message (TASK_RRC_GNB, 0, NGAP_PDUSESSION_MODIFY_RESP);
+ if (msg_p == NULL) {
+ LOG_E(NR_RRC, "itti_alloc_new_message failed, msg_p is NULL \n");
+ return (-1);
+ }
+
+ LOG_I(NR_RRC, "send message NGAP_PDUSESSION_MODIFY_RESP \n");
+
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).gNB_ue_ngap_id = ue_context_pP->ue_context.gNB_ue_ngap_id;
+
+ for (i = 0; i < ue_context_pP->ue_context.nb_of_modify_pdusessions; i++) {
+ if (xid == ue_context_pP->ue_context.modify_pdusession[i].xid) {
+ if (ue_context_pP->ue_context.modify_pdusession[i].status == PDU_SESSION_STATUS_DONE) {
+ for (j = 0; j < ue_context_pP->ue_context.setup_pdu_sessions; j++) {
+ if (ue_context_pP->ue_context.modify_pdusession[i].param.pdusession_id ==
+ ue_context_pP->ue_context.pduSession[j].param.pdusession_id) {
+ LOG_I(NR_RRC, "update pdu session %d \n", ue_context_pP->ue_context.pduSession[j].param.pdusession_id);
+ // Update ue_context_pP->ue_context.pduSession
+ ue_context_pP->ue_context.pduSession[j].status = PDU_SESSION_STATUS_ESTABLISHED;
+ ue_context_pP->ue_context.pduSession[j].cause = NGAP_CAUSE_NOTHING;
+ for (qos_flow_index = 0; qos_flow_index < ue_context_pP->ue_context.modify_pdusession[i].param.nb_qos; qos_flow_index++) {
+ ue_context_pP->ue_context.pduSession[j].param.qos[qos_flow_index] =
+ ue_context_pP->ue_context.modify_pdusession[i].param.qos[qos_flow_index];
+ }
+ break;
+ }
+ }
+
+ if (j < ue_context_pP->ue_context.setup_pdu_sessions) {
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).pdusessions[pdu_sessions_done].pdusession_id =
+ ue_context_pP->ue_context.modify_pdusession[i].param.pdusession_id;
+ for (qos_flow_index = 0; qos_flow_index < ue_context_pP->ue_context.modify_pdusession[i].param.nb_qos; qos_flow_index++) {
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).pdusessions[pdu_sessions_done].qos[qos_flow_index].qfi =
+ ue_context_pP->ue_context.modify_pdusession[i].param.qos[qos_flow_index].qfi;
+ }
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).pdusessions[pdu_sessions_done].nb_of_qos_flow =
+ ue_context_pP->ue_context.modify_pdusession[i].param.nb_qos;
+ LOG_I(NR_RRC, "Modify Resp (msg index %d, pdu session index %d, status %d, xid %d): nb_of_modify_pdusessions %d, pdusession_id %d \n ",
+ pdu_sessions_done, i, ue_context_pP->ue_context.modify_pdusession[i].status, xid,
+ ue_context_pP->ue_context.nb_of_modify_pdusessions,
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).pdusessions[pdu_sessions_done].pdusession_id);
+ pdu_sessions_done++;
+ } else {
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).pdusessions_failed[pdu_sessions_failed].pdusession_id =
+ ue_context_pP->ue_context.modify_pdusession[i].param.pdusession_id;
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).pdusessions_failed[pdu_sessions_failed].cause = NGAP_CAUSE_RADIO_NETWORK;
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).pdusessions_failed[pdu_sessions_failed].cause_value = NGAP_CauseRadioNetwork_unknown_PDU_session_ID;
+ pdu_sessions_failed++;
+ }
+ } else if ((ue_context_pP->ue_context.modify_pdusession[i].status == PDU_SESSION_STATUS_NEW) ||
+ (ue_context_pP->ue_context.modify_pdusession[i].status == PDU_SESSION_STATUS_ESTABLISHED)) {
+ LOG_D (NR_RRC, "PDU SESSION is NEW or already ESTABLISHED\n");
+ } else if (ue_context_pP->ue_context.modify_pdusession[i].status == PDU_SESSION_STATUS_FAILED) {
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).pdusessions_failed[pdu_sessions_failed].pdusession_id =
+ ue_context_pP->ue_context.modify_pdusession[i].param.pdusession_id;
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).pdusessions_failed[pdu_sessions_failed].cause =
+ ue_context_pP->ue_context.modify_pdusession[i].cause;
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).pdusessions_failed[pdu_sessions_failed].cause_value =
+ ue_context_pP->ue_context.modify_pdusession[i].cause_value;
+ pdu_sessions_failed++;
+ }
+ } else {
+ LOG_D(NR_RRC,"xid does not correspond (context pdu session index %d, status %d, xid %d/%d) \n ",
+ i, ue_context_pP->ue_context.modify_pdusession[i].status, xid, ue_context_pP->ue_context.modify_pdusession[i].xid);
+ }
+ }
+
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).nb_of_pdusessions = pdu_sessions_done;
+ NGAP_PDUSESSION_MODIFY_RESP(msg_p).nb_of_pdusessions_failed = pdu_sessions_failed;
+
+ if (pdu_sessions_done > 0 || pdu_sessions_failed > 0) {
+ LOG_D(NR_RRC,"NGAP_PDUSESSION_MODIFY_RESP: sending the message: nb_of_pdusessions %d, total pdu session %d, index %d\n",
+ ue_context_pP->ue_context.nb_of_modify_pdusessions, ue_context_pP->ue_context.setup_pdu_sessions, i);
+ itti_send_msg_to_task (TASK_NGAP, ctxt_pP->instance, msg_p);
+ } else {
+ itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
+ }
+
+ return 0;
+}
+
+//------------------------------------------------------------------------------
void
rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_REQ(
const module_id_t gnb_mod_idP,
@@ -1126,12 +1327,6 @@ rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_REQ(
if (ue_context_pP == NULL) {
LOG_E(RRC, "[gNB] In NGAP_UE_CONTEXT_RELEASE_REQ: invalid UE\n");
} else {
- MSC_LOG_TX_MESSAGE(MSC_RRC_GNB,
- MSC_NGAP_GNB,
- NULL,
- 0,
- "0 NGAP_UE_CONTEXT_RELEASE_REQ gNB_ue_ngap_id 0x%06"PRIX32" ",
- ue_context_pP->ue_context.gNB_ue_ngap_id);
MessageDef *msg_context_release_req_p = NULL;
msg_context_release_req_p = itti_alloc_new_message(TASK_RRC_GNB, 0, NGAP_UE_CONTEXT_RELEASE_REQ);
NGAP_UE_CONTEXT_RELEASE_REQ(msg_context_release_req_p).gNB_ue_ngap_id = ue_context_pP->ue_context.gNB_ue_ngap_id;
@@ -1204,14 +1399,6 @@ rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_COMMAND(
LOG_W(NR_RRC, "[gNB %ld] In NGAP_UE_CONTEXT_RELEASE_COMMAND: unknown UE from gNB_ue_ngap_id (%u)\n",
instance,
gNB_ue_ngap_id);
- MSC_LOG_EVENT(MSC_RRC_GNB, "0 NGAP_UE_CONTEXT_RELEASE_COMPLETE gNB_ue_ngap_id 0x%06"PRIX32" context not found",
- gNB_ue_ngap_id);
- MSC_LOG_TX_MESSAGE(MSC_RRC_GNB,
- MSC_NGAP_GNB,
- NULL,
- 0,
- "0 NGAP_UE_CONTEXT_RELEASE_COMPLETE gNB_ue_ngap_id 0x%06"PRIX32" ",
- gNB_ue_ngap_id);
msg_complete_p = itti_alloc_new_message(TASK_RRC_GNB, 0, NGAP_UE_CONTEXT_RELEASE_COMPLETE);
NGAP_UE_CONTEXT_RELEASE_COMPLETE(msg_complete_p).gNB_ue_ngap_id = gNB_ue_ngap_id;
itti_send_msg_to_task(TASK_NGAP, instance, msg_complete_p);
@@ -1235,9 +1422,6 @@ rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_COMMAND(
void rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_COMPLETE(
instance_t instance,
uint32_t gNB_ue_ngap_id) {
- MSC_LOG_TX_MESSAGE(MSC_RRC_GNB, MSC_NGAP_GNB, NULL, 0,
- "0 NGAP_UE_CONTEXT_RELEASE_COMPLETE gNB_ue_ngap_id 0x%06"PRIX32" ",
- gNB_ue_ngap_id);
MessageDef *msg = itti_alloc_new_message(TASK_RRC_GNB, 0, NGAP_UE_CONTEXT_RELEASE_COMPLETE);
NGAP_UE_CONTEXT_RELEASE_COMPLETE(msg).gNB_ue_ngap_id = gNB_ue_ngap_id;
itti_send_msg_to_task(TASK_NGAP, instance, msg);
@@ -1395,7 +1579,6 @@ rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(
protocol_ctxt_t ctxt;
pdusession_release_t pdusession_release_params[NGAP_MAX_PDUSESSION];
uint8_t nb_pdusessions_torelease;
- MessageDef *msg_delete_tunnels_p = NULL;
uint8_t xid;
int i, pdusession;
uint8_t b_existed,is_existed;
@@ -1473,20 +1656,18 @@ rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(
} else {
//gtp tunnel delete
LOG_I(NR_RRC, "gtp tunnel delete \n");
- msg_delete_tunnels_p = itti_alloc_new_message(TASK_RRC_GNB, 0, GTPV1U_GNB_DELETE_TUNNEL_REQ);
- memset(>PV1U_GNB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p), 0, sizeof(GTPV1U_GNB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p)));
- GTPV1U_GNB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p).rnti = ue_context_p->ue_context.rnti;
+ gtpv1u_gnb_delete_tunnel_req_t req={0};
+ req.rnti = ue_context_p->ue_context.rnti;
for(i = 0; i < NB_RB_MAX; i++) {
if(xid == ue_context_p->ue_context.pduSession[i].xid) {
- GTPV1U_GNB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p).pdusession_id[GTPV1U_GNB_DELETE_TUNNEL_REQ(msg_delete_tunnels_p).num_pdusession++] = ue_context_p->ue_context.gnb_gtp_psi[i];
+ req.pdusession_id[req.num_pdusession++] = ue_context_p->ue_context.gnb_gtp_psi[i];
ue_context_p->ue_context.gnb_gtp_teid[i] = 0;
memset(&ue_context_p->ue_context.gnb_gtp_addrs[i], 0, sizeof(ue_context_p->ue_context.gnb_gtp_addrs[i]));
ue_context_p->ue_context.gnb_gtp_psi[i] = 0;
}
}
-
- itti_send_msg_to_task(TASK_GTPV1_U, instance, msg_delete_tunnels_p);
+ gtpv1u_delete_ngu_tunnel(instance, &req);
//NGAP_PDUSESSION_RELEASE_RESPONSE
rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE(&ctxt, ue_context_p, xid);
LOG_I(NR_RRC, "Send PDU Session Release Response \n");
diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.h b/openair2/RRC/NR/rrc_gNB_NGAP.h
index 8779d62ff6b37d9ff7a9464ea87eb1245a2a97a3..5833c8aac217de8476bc9aa38370d243955c402c 100644
--- a/openair2/RRC/NR/rrc_gNB_NGAP.h
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.h
@@ -38,6 +38,7 @@
#include "NR_RRCSetupComplete-IEs.h"
#include "NR_RegisteredAMF.h"
#include "NR_UL-DCCH-Message.h"
+#include "NGAP_CauseRadioNetwork.h"
typedef struct rrc_ue_ngap_ids_s {
/* Tree related data */
@@ -107,6 +108,27 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
instance_t instance
);
+int
+rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
+ MessageDef *msg_p,
+ const char *msg_name,
+ instance_t instance
+);
+
+int
+rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(
+ const protocol_ctxt_t *const ctxt_pP,
+ rrc_gNB_ue_context_t *const ue_context_pP,
+ uint8_t xid
+);
+
+void
+rrc_gNB_modify_dedicatedRRCReconfiguration(
+ const protocol_ctxt_t *const ctxt_pP,
+ rrc_gNB_ue_context_t *ue_context_pP
+);
+
+
void
rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_REQ(
const module_id_t gnb_mod_idP,
diff --git a/openair2/RRC/NR/rrc_gNB_UE_context.c b/openair2/RRC/NR/rrc_gNB_UE_context.c
index ad8bd01470e31800da49f196b828197d28a07064..b8ff19b749e93e95428d72954b03d1ab58d93f87 100644
--- a/openair2/RRC/NR/rrc_gNB_UE_context.c
+++ b/openair2/RRC/NR/rrc_gNB_UE_context.c
@@ -35,7 +35,6 @@
#include "common/utils/LOG/log.h"
#include "rrc_gNB_UE_context.h"
-#include "msc.h"
//------------------------------------------------------------------------------
@@ -208,10 +207,6 @@ void rrc_gNB_remove_ue_context(
}
RB_REMOVE(rrc_nr_ue_tree_s, &rrc_instance_pP->rrc_ue_head, ue_context_pP);
- MSC_LOG_EVENT(
- MSC_RRC_ENB,
- "0 Removed UE %"PRIx16" ",
- ue_context_pP->ue_context.rnti);
rrc_gNB_free_mem_UE_context(ctxt_pP, ue_context_pP);
nr_uid_linear_allocator_free(rrc_instance_pP, ue_context_pP->local_uid);
free(ue_context_pP);
diff --git a/openair2/RRC/NR/rrc_gNB_nsa.c b/openair2/RRC/NR/rrc_gNB_nsa.c
index 1493ded6c06b93959184b4dbcf0b63db9265de32..e55c9d4ed2272057118618552fae8d0f04d48ade 100644
--- a/openair2/RRC/NR/rrc_gNB_nsa.c
+++ b/openair2/RRC/NR/rrc_gNB_nsa.c
@@ -42,27 +42,7 @@
#include <openair2/RRC/NR/rrc_gNB_UE_context.h>
#include <openair3/ocp-gtpu/gtp_itf.h>
#include "UTIL/OSA/osa_defs.h"
-
-extern boolean_t nr_rrc_pdcp_config_asn1_req(
- const protocol_ctxt_t *const ctxt_pP,
- NR_SRB_ToAddModList_t *const srb2add_list,
- NR_DRB_ToAddModList_t *const drb2add_list,
- NR_DRB_ToReleaseList_t *const drb2release_list,
- const uint8_t security_modeP,
- uint8_t *const kRRCenc,
- uint8_t *const kRRCint,
- uint8_t *const kUPenc,
- uint8_t *const kUPint
- ,LTE_PMCH_InfoList_r9_t *pmch_InfoList_r9
- ,rb_id_t *const defaultDRB,
- struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list);
-
-extern rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP,
- const NR_SRB_ToAddModList_t * const srb2add_listP,
- const NR_DRB_ToAddModList_t * const drb2add_listP,
- const NR_DRB_ToReleaseList_t * const drb2release_listP,
- const LTE_PMCH_InfoList_r9_t * const pmch_InfoList_r9_pP,
- struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list);
+#include <openair2/RRC/NR/nr_rrc_proto.h>
void rrc_parse_ue_capabilities(gNB_RRC_INST *rrc, NR_UE_CapabilityRAT_ContainerList_t *UE_CapabilityRAT_ContainerList, x2ap_ENDC_sgnb_addition_req_t *m, NR_CG_ConfigInfo_IEs_t *cg_config_info) {
struct rrc_gNB_ue_context_s *ue_context_p = NULL;
@@ -381,6 +361,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts,
rrc->carrier.sib1_tda,
+ rrc->carrier.minRXTXTIME,
rrc->carrier.servingcellconfigcommon,
&rrc->carrier.mib,
1, // add_ue flag
@@ -392,6 +373,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts,
rrc->carrier.sib1_tda,
+ rrc->carrier.minRXTXTIME,
NULL,
NULL,
1, // add_ue flag
diff --git a/openair2/RRC/NR/rrc_gNB_reconfig.c b/openair2/RRC/NR/rrc_gNB_reconfig.c
index 680f966f9918117d61bad15434f90807343499fe..120a508cdf1ee78e0d0b02f1a585e47d38b6f191 100644
--- a/openair2/RRC/NR/rrc_gNB_reconfig.c
+++ b/openair2/RRC/NR/rrc_gNB_reconfig.c
@@ -916,9 +916,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
pucch_Config->resourceToAddModList = calloc(1,sizeof(*pucch_Config->resourceToAddModList));
pucch_Config->resourceToReleaseList = NULL;
NR_PUCCH_Resource_t *pucchres0=calloc(1,sizeof(*pucchres0));
- NR_PUCCH_Resource_t *pucchres1=calloc(1,sizeof(*pucchres1));
NR_PUCCH_Resource_t *pucchres2=calloc(1,sizeof(*pucchres2));
- NR_PUCCH_Resource_t *pucchres3=calloc(1,sizeof(*pucchres3));
pucchres0->pucch_ResourceId=1;
pucchres0->startingPRB= (8 + uid) % curr_bwp;
@@ -1337,17 +1335,17 @@ void config_csirs(NR_ServingCellConfigCommon_t *servingcellconfigcommon,
resourceMapping.frequencyDomainAllocation.choice.row2.buf = calloc(2, sizeof(uint8_t));
resourceMapping.frequencyDomainAllocation.choice.row2.size = 2;
resourceMapping.frequencyDomainAllocation.choice.row2.bits_unused = 4;
- resourceMapping.frequencyDomainAllocation.choice.row2.buf[0]=0;
- resourceMapping.frequencyDomainAllocation.choice.row2.buf[1]=16;
+ resourceMapping.frequencyDomainAllocation.choice.row2.buf[0] = 0;
+ resourceMapping.frequencyDomainAllocation.choice.row2.buf[1] = 16;
resourceMapping.nrofPorts = NR_CSI_RS_ResourceMapping__nrofPorts_p1;
resourceMapping.cdm_Type = NR_CSI_RS_ResourceMapping__cdm_Type_noCDM;
break;
case 2:
resourceMapping.frequencyDomainAllocation.present = NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_other;
- resourceMapping.frequencyDomainAllocation.choice.row2.buf = calloc(2, sizeof(uint8_t));
- resourceMapping.frequencyDomainAllocation.choice.row2.size = 1;
- resourceMapping.frequencyDomainAllocation.choice.row2.bits_unused = 2;
- resourceMapping.frequencyDomainAllocation.choice.row2.buf[0]=4;
+ resourceMapping.frequencyDomainAllocation.choice.other.buf = calloc(2, sizeof(uint8_t));
+ resourceMapping.frequencyDomainAllocation.choice.other.size = 1;
+ resourceMapping.frequencyDomainAllocation.choice.other.bits_unused = 2;
+ resourceMapping.frequencyDomainAllocation.choice.other.buf[0] = 4;
resourceMapping.nrofPorts = NR_CSI_RS_ResourceMapping__nrofPorts_p2;
resourceMapping.cdm_Type = NR_CSI_RS_ResourceMapping__cdm_Type_fd_CDM2;
break;
diff --git a/openair2/RRC/NR_UE/rrc_UE.c b/openair2/RRC/NR_UE/rrc_UE.c
index f910ff68d45fcfc1616ed31c92d408676baaa2ea..fa1690e450cb060f884363b2be539eacadd15790 100644
--- a/openair2/RRC/NR_UE/rrc_UE.c
+++ b/openair2/RRC/NR_UE/rrc_UE.c
@@ -72,6 +72,7 @@
#include <executables/softmodem-common.h>
#include "nr_nas_msg_sim.h"
+#include <openair2/RRC/NR/nr_rrc_proto.h>
NR_UE_RRC_INST_t *NR_UE_rrc_inst;
/* NAS Attach request with IMSI */
@@ -178,27 +179,6 @@ static int nr_rrc_set_sub_state( module_id_t ue_mod_idP, Rrc_Sub_State_NR_t subS
return (0);
}
-extern boolean_t nr_rrc_pdcp_config_asn1_req(
- const protocol_ctxt_t *const ctxt_pP,
- NR_SRB_ToAddModList_t *const srb2add_list,
- NR_DRB_ToAddModList_t *const drb2add_list,
- NR_DRB_ToReleaseList_t *const drb2release_list,
- const uint8_t security_modeP,
- uint8_t *const kRRCenc,
- uint8_t *const kRRCint,
- uint8_t *const kUPenc,
- uint8_t *const kUPint
- ,LTE_PMCH_InfoList_r9_t *pmch_InfoList_r9
- ,rb_id_t *const defaultDRB,
- struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list);
-
-extern rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP,
- const NR_SRB_ToAddModList_t * const srb2add_listP,
- const NR_DRB_ToAddModList_t * const drb2add_listP,
- const NR_DRB_ToReleaseList_t * const drb2release_listP,
- const LTE_PMCH_InfoList_r9_t * const pmch_InfoList_r9_pP,
- struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list);
-
// from LTE-RRC DL-DCCH RRCConnectionReconfiguration nr-secondary-cell-group-config (encoded)
int8_t nr_rrc_ue_decode_secondary_cellgroup_config(const module_id_t module_id,
const uint8_t *buffer,
@@ -2164,17 +2144,6 @@ nr_rrc_ue_establish_srb2(
nr_derive_key_up_int(NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm,
NR_UE_rrc_inst[ctxt_pP->module_id].kgnb, &kUPint);
- MSC_LOG_TX_MESSAGE(
- MSC_RRC_UE,
- MSC_PDCP_UE,
- NULL,
- 0,
- MSC_AS_TIME_FMT" CONFIG_REQ UE %x DRB (security %X)",
- MSC_AS_TIME_ARGS(ctxt_pP),
- ctxt_pP->rnti,
- NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm |
- (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4));
-
// Refresh DRBs
nr_rrc_pdcp_config_asn1_req(ctxt_pP,
NULL,
@@ -2241,7 +2210,7 @@ nr_rrc_ue_establish_srb2(
// nr_rrc_ue_process_measConfig(ctxt_pP, gNB_index, ie->measConfig);
}
- if(ie->nonCriticalExtension->masterCellGroup!=NULL) {
+ if((ie->nonCriticalExtension) && (ie->nonCriticalExtension->masterCellGroup!=NULL)) {
nr_rrc_ue_process_masterCellGroup(
ctxt_pP,
gNB_index,
@@ -2254,7 +2223,7 @@ nr_rrc_ue_establish_srb2(
}
/* Check if there is dedicated NAS information to forward to NAS */
- if (ie->nonCriticalExtension->dedicatedNAS_MessageList != NULL) {
+ if ((ie->nonCriticalExtension) && (ie->nonCriticalExtension->dedicatedNAS_MessageList != NULL)) {
int list_count;
uint32_t pdu_length;
uint8_t *pdu_buffer;
diff --git a/openair2/SIMULATION/NR_RRC/itti_sim.c b/openair2/SIMULATION/NR_RRC/itti_sim.c
index 28de1ca3b83823a5b8f9e1da13e0fe9b808d10e6..a6ac444e45ba11bb458715aadcf6d69d8be60798 100644
--- a/openair2/SIMULATION/NR_RRC/itti_sim.c
+++ b/openair2/SIMULATION/NR_RRC/itti_sim.c
@@ -36,8 +36,6 @@
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
#include <common/utils/assertions.h>
-#include "msc.h"
-
#include "common/ran_context.h"
#include "common/config/config_userapi.h"
@@ -572,9 +570,6 @@ int main( int argc, char **argv )
cpuf=get_cpu_freq_GHz();
itti_init(TASK_MAX, tasks_info);
- // initialize mscgen log after ITTI
- MSC_INIT(MSC_E_UTRAN, ADDED_QUEUES_MAX+TASK_MAX);
-
init_opt();
diff --git a/openair2/UTIL/MATH/crc_byte.c b/openair2/UTIL/MATH/crc_byte.c
deleted file mode 100644
index a3ff00fec19725498bc461270f3d20f6e03a2fff..0000000000000000000000000000000000000000
--- a/openair2/UTIL/MATH/crc_byte.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*
- May 10, 2001
- Modified in June, 2001, to include the length non multiple of 8
- crc_byte.c
- Byte oriented implementation of CRC's
-
- */
-#include "rtos_header.h"
-#include "platform_types.h"
-
-
-/*ref 25.222 v4.0.0 , p12 */
-/* the highest degree is set by default */
-unsigned int poly24 = 0x80006100; // 1000 0000 0000 0000 0110 0001 D^24 + D^23 + D^6 + D^5 + D + 1
-unsigned int poly16 = 0x10210000; // 0001 0000 0010 0001 D^16 + D^12 + D^5 + 1
-unsigned int poly12 = 0x80F00000; // 1000 0000 1111 D^12 + D^11 + D^3 + D^2 + D + 1
-unsigned int poly8 = 0x9B000000; // 1001 1011 D^8 + D^7 + D^4 + D^3 + D + 1
-/*********************************************************
-
-For initialization && verification purposes,
- bit by bit implementation with any polynomial
-
-The first bit is in the MSB of each byte
-
-*********************************************************/
-static unsigned int
-crcbit (unsigned char * inputptr, int octetlen, unsigned int poly)
-{
- unsigned int i, crc = 0, c;
-
- while (octetlen-- > 0) {
- c = (*inputptr++) << 24;
-
- for (i = 8; i != 0; i--) {
- if ((1 << 31) & (c ^ crc))
- crc = (crc << 1) ^ poly;
- else
- crc <<= 1;
-
- c <<= 1;
- }
- }
-
- return crc;
-}
-
-/*********************************************************
-
-crc table initialization
-
-*********************************************************/
-static unsigned int crc24Table[256];
-static unsigned short crc16Table[256];
-static unsigned short crc12Table[256];
-static unsigned char crc8Table[256];
-void
-crcTableInit ()
-{
- unsigned char c = 0;
-
- do {
- crc24Table[c] = crcbit (&c, 1, poly24);
- crc16Table[c] = (unsigned short) (crcbit (&c, 1, poly16) >> 16);
- crc12Table[c] = (unsigned short) (crcbit (&c, 1, poly12) >> 16);
- crc8Table[c] = (unsigned char) (crcbit (&c, 1, poly8) >> 24);
- } while (++c);
-}
-
-/*********************************************************
-
-Byte by byte implementations,
-assuming initial byte is 0 padded (in MSB) if necessary
-
-*********************************************************/
-unsigned int
-crc24 (unsigned char * inptr, int bitlen)
-{
-
- int octetlen, resbit;
- unsigned int crc = 0;
- octetlen = bitlen / 8; /* Change in octets */
- resbit = (bitlen % 8);
-
- while (octetlen-- > 0) {
- crc = (crc << 8) ^ crc24Table[(*inptr++) ^ (crc >> 24)];
- }
-
- if (resbit > 0)
- crc = (crc << resbit) ^ crc24Table[((*inptr) >> (8 - resbit)) ^ (crc >> (32 - resbit))];
-
- return crc;
-}
-
-unsigned int
-crc16 (unsigned char * inptr, int bitlen)
-{
- int octetlen, resbit;
- unsigned int crc = 0;
- octetlen = bitlen / 8; /* Change in octets */
- resbit = (bitlen % 8);
-
- while (octetlen-- > 0) {
- crc = (crc << 8) ^ (crc16Table[(*inptr++) ^ (crc >> 24)] << 16);
- }
-
- if (resbit > 0)
- crc = (crc << resbit) ^ (crc16Table[((*inptr) >> (8 - resbit)) ^ (crc >> (32 - resbit))] << 16);
-
- return crc;
-}
-
-unsigned int
-crc12 (unsigned char * inptr, int bitlen)
-{
- int octetlen, resbit;
- unsigned int crc = 0;
- octetlen = bitlen / 8; /* Change in octets */
- resbit = (bitlen % 8);
-
- while (octetlen-- > 0) {
- crc = (crc << 8) ^ (crc12Table[(*inptr++) ^ (crc >> 24)] << 16);
- }
-
- if (resbit > 0)
- crc = (crc << resbit) ^ (crc12Table[((*inptr) >> (8 - resbit)) ^ (crc >> (32 - resbit))] << 16);
-
- return crc;
-}
-
-unsigned int
-crc8 (unsigned char * inptr, int bitlen)
-{
- int octetlen, resbit;
- unsigned int crc = 0;
- octetlen = bitlen / 8; /* Change in octets */
- resbit = (bitlen % 8);
-
- while (octetlen-- > 0) {
- crc = crc8Table[(*inptr++) ^ (crc >> 24)] << 24;
- }
-
- if (resbit > 0)
- crc = (crc << resbit) ^ (crc8Table[((*inptr) >> (8 - resbit)) ^ (crc >> (32 - resbit))] << 24);
-
- return crc;
-}
-
-/*******************************************************************/
-/**
- Test code
-********************************************************************/
-
-/* #ifdef MAIN
- #include <stdio.h>
- main()
- {
- unsigned char test[] = "Thebigredfox";
- crcTableInit();
- printf("%x\n", crcbit(test, sizeof(test) - 1, poly24));
- printf("%x\n", crc24(test, (sizeof(test) - 1)*8));
- printf("%x\n", crcbit(test, sizeof(test) - 1, poly8));
- printf("%x\n", crc8(test, (sizeof(test) - 1)*8));
- }
- #endif */
diff --git a/openair2/UTIL/MATH/random_proto_extern.h b/openair2/UTIL/MATH/random_proto_extern.h
deleted file mode 100644
index 45db5652172af569ec6838651c653e4aabca9720..0000000000000000000000000000000000000000
--- a/openair2/UTIL/MATH/random_proto_extern.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*
-
- random_proto_extern.h
- -------------------
- AUTHOR : Lionel GAUTHIER
- COMPANY : EURECOM
- EMAIL : Lionel.Gauthier@eurecom.fr
- ***************************************************************************/
-extern int uniform (void);
diff --git a/openair2/UTIL/MATH/taus.c b/openair2/UTIL/MATH/taus.c
deleted file mode 100644
index 6b5e03588dd2fc7cdb51edb49b659cef2969bea1..0000000000000000000000000000000000000000
--- a/openair2/UTIL/MATH/taus.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file taus.c
-* \brief random number generator per OAI component
-* \author Navid Nikaein
-* \date 2011 - 2014
-* \version 0.1
-* \email navid.nikaein@eurecom.fr
-* \warning
-* @ingroup util
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <math.h>
-#include "oml.h"
-
-unsigned int s0[MAX_NUM_COMPS], s1[MAX_NUM_COMPS], s2[MAX_NUM_COMPS], b[MAX_NUM_COMPS], r[MAX_NUM_COMPS];
-
-
-
-
-inline unsigned int taus(unsigned int comp) {
- b[comp] = (((s0[comp] << 13) ^ s0[comp]) >> 19);
- s0[comp] = (((s0[comp] & 0xFFFFFFFE) << 12)^ b[comp]);
- b[comp] = (((s1[comp] << 2) ^ s1[comp]) >> 25);
- s1[comp] = (((s1[comp] & 0xFFFFFFF8) << 4)^ b[comp]);
- b[comp] = (((s2[comp] << 3) ^ s2[comp]) >> 11);
- s2[comp] = (((s2[comp] & 0xFFFFFFF0) << 17)^ b[comp]);
- r[comp] = s0[comp] ^ s1[comp] ^ s2[comp];
- return r[comp];
-}
-
-/*void set_taus_seed(unsigned int seed_type) {
- unsigned int i; // i index of component
-
- for (i=MIN_NUM_COMPS; i < MAX_NUM_COMPS ; i ++) {
- switch (seed_type) {
- case 0: // use rand func
- if (i == 0) srand(time(NULL));
-
- s0[i] = ((unsigned int)rand());
- s1[i] = ((unsigned int)rand());
- s2[i] = ((unsigned int)rand());
- printf("Initial seeds use rand: s0[%u] = 0x%x, s1[%u] = 0x%x, s2[%u] = 0x%x\n", i, s0[i], i, s1[i], i, s2[i]);
- break;
-
- case 1: // use rand with seed
- if (i == 0) srand(0x1e23d851);
-
- s0[i] = ((unsigned int)rand());
- s1[i] = ((unsigned int)rand());
- s2[i] = ((unsigned int)rand());
- printf("Initial seeds use rand with seed : s0[%u] = 0x%x, s1[%u] = 0x%x, s2[%u] = 0x%x\n", i, s0[i], i, s1[i], i, s2[i]);
- break;
-
- default:
- break;
- }
- }
-}*/
-
-int get_rand (unsigned int comp) {
- if ((comp > MIN_NUM_COMPS) && (comp < MAX_NUM_COMPS))
- return r[comp];
- else {
- //LOG_E(RNG,"unknown component %d\n",comp);
- return -1;
- }
-}
-
-unsigned int dtaus(unsigned int comp, unsigned int a, unsigned b) {
- return (int) (((double)taus(comp)/(double)0xffffffff)* (double)(b-a) + (double)a);
-}
-/*
-#ifdef STANDALONE
-main() {
-
- unsigned int i,randomg, randphy;
-
- set_taus_seed(0);
- printf("dtaus %d \n",dtaus(PHY, 1000, 1000000));
-
- do {//for (i=0;i<10;i++){
- randphy = taus(PHY);
- randomg = taus(OTG);
- i++;
- // printf("rand for OMG (%d,0x%x) PHY (%d,0x%x)\n",OMG, randomg, PHY, randphy);
- } while (randphy != randomg);
- printf("after %d run: get rand for (OMG 0x%x, PHY 0x%x)\n",i, get_rand(OTG), get_rand(PHY));
-
-}
-#endif
-
-*/
diff --git a/openair2/X2AP/x2ap_eNB.c b/openair2/X2AP/x2ap_eNB.c
index 38e6149ccd2ef103f8425720c53816ca3a546cd4..2b1d19001a12775e13661e0bdb8c3652163a8680 100644
--- a/openair2/X2AP/x2ap_eNB.c
+++ b/openair2/X2AP/x2ap_eNB.c
@@ -621,7 +621,12 @@ void x2ap_eNB_handle_sgNB_release_request(instance_t instance,
}
target = x2ap_get_eNB(NULL, x2ap_release_req->assoc_id, 0);
- DevAssert(target != NULL);
+ if (target == NULL) {
+ X2AP_ERROR("no X2AP target eNB on assoc_id %d, dropping sgNB release request\n", x2ap_release_req->assoc_id);
+ /* x2ap_gNB_handle_ENDC_sGNB_release_request_acknowledge() would handle the
+ * ack, but does not do anything */
+ return;
+ }
/* id_source is not used by oai's gNB so it's not big deal. For
* interoperability with other gNBs things may need to be refined.
diff --git a/openair2/X2AP/x2ap_eNB_generate_messages.c b/openair2/X2AP/x2ap_eNB_generate_messages.c
index 9724e0cc381b0435256fb69f5fd3120631ee6640..be5ab82740566e3a73249df6fdafcb6607219318 100644
--- a/openair2/X2AP/x2ap_eNB_generate_messages.c
+++ b/openair2/X2AP/x2ap_eNB_generate_messages.c
@@ -40,7 +40,6 @@
#include "x2ap_eNB_itti_messaging.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
@@ -260,8 +259,6 @@ int x2ap_eNB_generate_x2_setup_request(
return -1;
}
- MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB, MSC_X2AP_TARGET_ENB, NULL, 0, "0 X2Setup/initiatingMessage assoc_id %u", x2ap_eNB_data_p->assoc_id);
-
x2ap_eNB_itti_send_sctp_data_req(instance_p->instance, x2ap_eNB_data_p->assoc_id, buffer, len, 0);
return ret;
@@ -486,8 +483,6 @@ int x2ap_eNB_generate_x2_setup_response(x2ap_eNB_instance_t *instance_p, x2ap_eN
x2ap_eNB_data_p->state = X2AP_ENB_STATE_READY;
- MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB, MSC_X2AP_TARGET_ENB, NULL, 0, "0 X2Setup/successfulOutcome assoc_id %u", x2ap_eNB_data_p->assoc_id);
-
x2ap_eNB_itti_send_sctp_data_req(instance_p->instance, x2ap_eNB_data_p->assoc_id, buffer, len, 0);
return ret;
@@ -542,11 +537,6 @@ int x2ap_eNB_generate_x2_setup_failure(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB,
- MSC_X2AP_TARGET_ENB, NULL, 0,
- "0 X2Setup/unsuccessfulOutcome assoc_id %u cause %u value %u",
- assoc_id, cause_type, cause_value);
-
x2ap_eNB_itti_send_sctp_data_req(instance, assoc_id, buffer, len, 0);
return ret;
@@ -732,8 +722,6 @@ int x2ap_eNB_generate_x2_handover_request (x2ap_eNB_instance_t *instance_p, x2ap
return -1;
}
- MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB, MSC_X2AP_TARGET_ENB, NULL, 0, "0 X2Handover/initiatingMessage assoc_id %u", x2ap_eNB_data_p->assoc_id);
-
x2ap_eNB_itti_send_sctp_data_req(instance_p->instance, x2ap_eNB_data_p->assoc_id, buffer, len, 1);
return ret;
@@ -846,8 +834,6 @@ int x2ap_eNB_generate_x2_handover_request_ack (x2ap_eNB_instance_t *instance_p,
return -1;
}
- MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB, MSC_X2AP_TARGET_ENB, NULL, 0, "0 X2Handover/successfulOutcome assoc_id %u", x2ap_eNB_data_p->assoc_id);
-
x2ap_eNB_itti_send_sctp_data_req(instance_p->instance, x2ap_eNB_data_p->assoc_id, buffer, len, 1);
return ret;
@@ -908,8 +894,6 @@ int x2ap_eNB_generate_x2_ue_context_release (x2ap_eNB_instance_t *instance_p, x2
return -1;
}
- MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB, MSC_X2AP_TARGET_ENB, NULL, 0, "0 X2UEContextRelease/initiatingMessage assoc_id %u", x2ap_eNB_data_p->assoc_id);
-
x2ap_eNB_itti_send_sctp_data_req(instance_p->instance, x2ap_eNB_data_p->assoc_id, buffer, len, 1);
return ret;
@@ -992,8 +976,6 @@ int x2ap_eNB_generate_x2_handover_cancel (x2ap_eNB_instance_t *instance_p, x2ap_
return -1;
}
- MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB, MSC_X2AP_TARGET_ENB, NULL, 0, "0 X2HandoverCancel/initiatingMessage assoc_id %u", x2ap_eNB_data_p->assoc_id);
-
x2ap_eNB_itti_send_sctp_data_req(instance_p->instance, x2ap_eNB_data_p->assoc_id, buffer, len, 1);
return ret;
@@ -1090,8 +1072,6 @@ int x2ap_eNB_generate_senb_addition_request (x2ap_eNB_instance_t *instance_p, x2
return -1;
}
- MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB, MSC_X2AP_TARGET_ENB, NULL, 0, "0 X2SeNBAdditionRequest/initiatingMessage assoc_id %u", x2ap_eNB_data_p->assoc_id);
-
x2ap_eNB_itti_send_sctp_data_req(instance_p->instance, x2ap_eNB_data_p->assoc_id, buffer, len, 1);
return ret;
@@ -1367,8 +1347,6 @@ MCC_MNC_TO_PLMNID(instance_p->mcc, instance_p->mnc, instance_p->mnc_digit_length
return -1;
}
- MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB, MSC_X2AP_TARGET_ENB, NULL, 0, "0 X2Setup/initiatingMessage assoc_id %u", x2ap_eNB_data_p->assoc_id);
-
x2ap_eNB_itti_send_sctp_data_req(instance_p->instance, x2ap_eNB_data_p->assoc_id, buffer, len, 0);
return ret;
@@ -1578,8 +1556,6 @@ int x2ap_eNB_generate_ENDC_x2_setup_response(
return -1;
}
- MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB, MSC_X2AP_TARGET_ENB, NULL, 0, "0 X2Setup/initiatingMessage assoc_id %u", x2ap_eNB_data_p->assoc_id);
-
x2ap_eNB_itti_send_sctp_data_req(instance_p->instance, x2ap_eNB_data_p->assoc_id, buffer, len, 0);
return ret;
@@ -1737,8 +1713,6 @@ int x2ap_eNB_generate_ENDC_x2_SgNB_addition_request(
# if 0 // TODO: Sanitizer complains we are trying to access this after free.
free(ie->value.choice.MeNBtoSgNBContainer.buf);
#endif
- MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB, MSC_X2AP_TARGET_ENB, NULL, 0, "0 X2Setup/initiatingMessage assoc_id %u", x2ap_eNB_data_p->assoc_id);
-
x2ap_eNB_itti_send_sctp_data_req(instance_p->instance, x2ap_eNB_data_p->assoc_id, buffer, len, 0);
return ret;
@@ -1844,8 +1818,6 @@ int x2ap_gNB_generate_ENDC_x2_SgNB_addition_request_ACK( x2ap_eNB_instance_t *in
return -1;
}
- MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB, MSC_X2AP_TARGET_ENB, NULL, 0, "0 X2Setup/initiatingMessage assoc_id %u", x2ap_eNB_data_p->assoc_id);
-
x2ap_eNB_itti_send_sctp_data_req(instance_p->instance, x2ap_eNB_data_p->assoc_id, buffer, len, 0);
return ret;
diff --git a/openair2/X2AP/x2ap_eNB_handler.c b/openair2/X2AP/x2ap_eNB_handler.c
index f71229f066115a024958687ae61b455ca04f816d..f70cd632aa6532d97d755098c4f675d1e749fc04 100644
--- a/openair2/X2AP/x2ap_eNB_handler.c
+++ b/openair2/X2AP/x2ap_eNB_handler.c
@@ -41,7 +41,6 @@
#include "x2ap_eNB_management_procedures.h"
#include "x2ap_eNB_generate_messages.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
#include "X2AP_FreqBandNrItem.h"
diff --git a/openair3/GTPV1-U/Makefile.am b/openair3/GTPV1-U/Makefile.am
deleted file mode 100644
index 30ea61d6c17508e90f0fa7d9f49acc4988ef1c6f..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements. See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# * contact@openairinterface.org
-# */
-
-AM_CFLAGS = @ADD_CFLAGS@ \
- -I$(top_srcdir)/COMMON \
- -I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network \
- -I$(top_srcdir)/NAS/EURECOM-NAS/src/include \
- -I$(top_srcdir)/NAS/EURECOM-NAS/src/ies \
- -I$(top_srcdir)/NAS/EURECOM-NAS/src/emm/msg \
- -I$(top_srcdir)/NAS/EURECOM-NAS/src/esm/msg \
- -I$(top_srcdir)/NAS/EURECOM-NAS/src/util \
- -I$(top_srcdir)/INTERTASK_INTERFACE \
- -I$(top_srcdir)/GTPV1-U/nw-gtpv1u/include \
- -I$(top_srcdir)/GTPV1-U/nw-gtpv1u/shared \
- -I$(top_srcdir)/UTILS \
- -I$(top_srcdir)/UTILS/HASHTABLE \
- -I$(top_srcdir)/UTILS/TIMER
-
-noinst_LTLIBRARIES = libgtpv1u.la
-
-libgtpv1u_la_LDFLAGS = -all-static
-
-libgtpv1u_la_SOURCES = \
- gtpv1u_task.c gtpv1u.h \
- gtpv1u_teid_pool.c \
- nw-gtpv1u/shared/NwTypes.h \
- nw-gtpv1u/shared/NwUtils.h \
- nw-gtpv1u/shared/NwGtpv1uError.h \
- nw-gtpv1u/shared/NwLog.h \
- nw-gtpv1u/shared/NwGtpv1uIe.h \
- nw-gtpv1u/shared/NwGtpv1uMsg.h \
- nw-gtpv1u/shared/NwGtpv1u.h \
- nw-gtpv1u/include/NwGtpv1uPrivate.h \
- nw-gtpv1u/include/NwGtpv1uLog.h \
- nw-gtpv1u/include/NwGtpv1uTrxn.h \
- nw-gtpv1u/include/NwGtpv1uTunnelEndPoint.h \
- nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c \
- nw-gtpv1u/src/NwGtpv1uTrxn.c \
- nw-gtpv1u/src/NwGtpv1uMsg.c \
- nw-gtpv1u/src/NwGtpv1u.c
diff --git a/openair3/GTPV1-U/Makefile.eNB b/openair3/GTPV1-U/Makefile.eNB
deleted file mode 100644
index b469dc756d0d453c71fd13ebcfa59fdb5f6d3a81..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/Makefile.eNB
+++ /dev/null
@@ -1,67 +0,0 @@
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements. See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# * contact@openairinterface.org
-# */
-
-OUTDIR = .
-
-libgtpv1u_OBJECTS = \
- nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.o \
- nw-gtpv1u/src/NwGtpv1uTrxn.o \
- nw-gtpv1u/src/NwGtpv1uMsg.o \
- nw-gtpv1u/src/NwGtpv1u.o \
- gtpv1u_eNB.o \
- gtpv1u_teid_pool.o
-
-# pull in dependency info for *existing* .o files
--include $(OUTDIR)/*.d
-
-CFLAGS = \
- -Wall \
- $(GTPV1U_CFLAGS) \
- -DENB_MODE \
- -Werror=uninitialized \
- -Werror=implicit-function-declaration
-
-$(OUTDIR)/%.o : %.c
- @echo "Compiling $<"
- @if [ ! -d $(dir $@) ]; then mkdir -p $(dir $@); fi;
- @$(CC) -c $(CFLAGS) -o $@ $<
- @$(CC) -MM $(CFLAGS) $< > $(basename $@).d
- @mv -f $(basename $@).d $(basename $@).d.tmp
- @sed -e 's|.*:|$@:|' < $(basename $@).d.tmp > $(basename $@).d
- @sed -e 's/.*://' -e 's/\\$$//' < $(basename $@).d.tmp | fmt -1 | \
- sed -e 's/^ *//' -e 's/$$/:/' >> $(basename $@).d
- @rm -f $(basename $@).d.tmp
-
-objsdir:
- @if [ ! -d $(OUTDIR) ]; then mkdir -p $(OUTDIR); fi;
-
-$(OUTDIR)/libgtpv1u.a: $(addprefix $(OUTDIR)/,$(libgtpv1u_OBJECTS))
- @echo Creating GTPV1U archive
- @$(AR) rcs $@ $(addprefix $(OUTDIR)/,$(libgtpv1u_OBJECTS))
-
-clean:
- @$(RM_F_V) $(OUTDIR)/nw-gtpv1u/src/*.o
- @$(RM_F_V) $(OUTDIR)/nw-gtpv1u/src/*.d
- @$(RM_F_V) $(OUTDIR)/*.o
- @$(RM_F_V) $(OUTDIR)/*.d
- @$(RM_F_V) $(OUTDIR)/libgtpv1u.a
-
-cleanall: clean
diff --git a/openair3/GTPV1-U/gtpv1u.h b/openair3/GTPV1-U/gtpv1u.h
deleted file mode 100644
index 9466f024bc0ce1c2131de57ae4a2e2282136d7bd..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/gtpv1u.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file gtpv1u.h
-* \brief
-* \author Sebastien ROUX, Lionel Gauthier
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-*/
-
-#ifndef GTPV1_U_H_
-#define GTPV1_U_H_
-
-#define GTPU_STACK_ENB 0
-#define GTPU_STACK_SGW 1
-
-/* When gtpv1u is compiled for eNB use MACRO from UTILS/log.h,
- * otherwise use standard fprintf as logger.
- */
-#if defined(ENB_MODE)
-# define GTPU_DEBUG(x, args...) LOG_D(GTPU, x, ##args)
-# define GTPU_INFO(x, args...) LOG_I(GTPU, x, ##args)
-# define GTPU_WARNING(x, args...) LOG_W(GTPU, x, ##args)
-# define GTPU_ERROR(x, args...) LOG_E(GTPU, x, ##args)
-#else
-# define GTPU_DEBUG(x, args...) fprintf(stdout, "[GTPU][D]"x, ##args)
-# define GTPU_INFO(x, args...) fprintf(stdout, "[GTPU][I]"x, ##args)
-# define GTPU_WARNING(x, args...) fprintf(stdout, "[GTPU][W]"x, ##args)
-# define GTPU_ERROR(x, args...) fprintf(stderr, "[GTPU][E]"x, ##args)
-#endif
-
-//#warning "TO BE REFINED"
-# define GTPU_HEADER_OVERHEAD_MAX 64
-
-uint32_t gtpv1u_new_teid(void);
-
-#endif /* GTPV1_U_H_ */
diff --git a/openair3/GTPV1-U/gtpv1u_eNB.c b/openair3/GTPV1-U/gtpv1u_eNB.c
deleted file mode 100644
index 6f5ef004b5936d727afedb62635b392935044099..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/gtpv1u_eNB.c
+++ /dev/null
@@ -1,1600 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file gtpv1u_eNB.c
- * \brief
- * \author Sebastien ROUX, Lionel GAUTHIER, Navid Nikaein
- * \version 1.0
- * \company Eurecom
- * \email: lionel.gauthier@eurecom.fr
- */
-#include <stdio.h>
-#include <errno.h>
-
-#include "mme_config.h"
-
-#include "assertions.h"
-#include "intertask_interface.h"
-#include "msc.h"
-
-#include "gtpv1u.h"
-#include "NwGtpv1u.h"
-#include "NwGtpv1uMsg.h"
-#include "NwGtpv1uPrivate.h"
-#include "NwLog.h"
-#include "gtpv1u_eNB_defs.h"
-#include "gtpv1_u_messages_types.h"
-#include "udp_eNB_task.h"
-#include "common/utils/LOG/log.h"
-#include "COMMON/platform_types.h"
-#include "COMMON/platform_constants.h"
-#include "common/utils/LOG/vcd_signal_dumper.h"
-#include "common/ran_context.h"
-#include "gtpv1u_eNB_defs.h"
-#include "gtpv1u_eNB_task.h"
-#include "rrc_eNB_GTPV1U.h"
-#include <common/utils/msc/msc.h>
-
-#undef GTP_DUMP_SOCKET
-
-extern unsigned char NB_eNB_INST;
-extern RAN_CONTEXT_t RC;
-
-extern struct rrc_eNB_ue_context_s *
-rrc_eNB_get_ue_context(
- eNB_RRC_INST *rrc_instance_pP,
- rnti_t rntiP);
-
-#if defined(GTP_DUMP_SOCKET) && GTP_DUMP_SOCKET > 0
-#include <linux/if.h>
-static int gtpv1u_dump_socket_g;
-
-//-----------------------------------------------------------------------------
-int gtpv1u_eNB_create_dump_socket(void) {
- struct ifreq ifr;
- int hdrincl=1;
-
- if ((gtpv1u_dump_socket_g = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) < 0 ) {
- LOG_E(GTPU, "Could not create dump socket %d:%s\n", errno, strerror(errno));
- return -1;
- }
-
- if (setsockopt(gtpv1u_dump_socket_g,
- IPPROTO_IP,
- IP_HDRINCL,
- &hdrincl,
- sizeof(hdrincl))==-1) {
- LOG_E(GTPU, "%s:%d set IP_HDRINCL %d:%s\n",
- __FILE__, __LINE__, errno, strerror(errno));
- }
-
- memset(&ifr, 0, sizeof(ifr));
- snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "lo");
-
- if (setsockopt(gtpv1u_dump_socket_g, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr)) < 0) {
- LOG_E(GTPU, "%s:%d setsockopt SO_BINDTODEVICE %d:%s\n",
- __FILE__, __LINE__, errno, strerror(errno));
- close(gtpv1u_dump_socket_g);
- return -1;
- }
-}
-
-//-----------------------------------------------------------------------------
-static void gtpv1u_eNB_write_dump_socket(uint8_t *buffer_pP, uint32_t buffer_lengthP) {
- struct sockaddr_in sin;
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
- sin.sin_addr.s_addr = INADDR_LOOPBACK;
-
- if (sendto(gtpv1u_dump_socket_g, buffer_pP, (size_t)buffer_lengthP, 0, (struct sockaddr *)&sin, sizeof(struct sockaddr)) < 0) {
- LOG_E(GTPU, "%s:%s:%d sendto %d:%s\n",
- __FILE__, __FUNCTION__, __LINE__, errno, strerror(errno));
- }
-}
-
-#endif
-
-//-----------------------------------------------------------------------------
-static int gtpv1u_eNB_get_msgsource(struct rrc_eNB_ue_context_s *ue_context_p, teid_t teid) {
- int erab_index = 0;
-
- /* source enb */
- if(ue_context_p->ue_context.handover_info != NULL && ue_context_p->ue_context.handover_info->state == HO_COMPLETE) {
- return GTPV1U_MSG_FROM_SPGW;
- }
-
- /* target enb */
- for (erab_index = 0; erab_index < ue_context_p->ue_context.nb_x2u_e_rabs; erab_index++) {
- if(ue_context_p->ue_context.enb_gtp_x2u_teid[erab_index] == teid) {
- return GTPV1U_MSG_FROM_SOURCE_ENB;
- }
- }
-
- return GTPV1U_MSG_FROM_SPGW;
-}
-
-//-----------------------------------------------------------------------------
-static int gtpv1u_eNB_send_init_udp(const Gtpv1uS1Req *req) {
- // Create and alloc new message
- MessageDef *message_p;
- struct in_addr addr= {0};
- message_p = itti_alloc_new_message(TASK_GTPV1_U, 0, UDP_INIT);
-
- if (message_p == NULL) {
- return -1;
- }
-
- UDP_INIT(message_p).port = req->enb_port_for_S1u_S12_S4_up;
- addr.s_addr = req->enb_ip_address_for_S1u_S12_S4_up;
- UDP_INIT(message_p).address = inet_ntoa(addr);
- LOG_I(GTPU, "Tx UDP_INIT IP addr %s (%x)\n", UDP_INIT(message_p).address,UDP_INIT(message_p).port);
- MSC_LOG_EVENT(
- MSC_GTPU_ENB,
- "0 UDP bind %s:%u",
- UDP_INIT(message_p).address,
- UDP_INIT(message_p).port);
- return itti_send_msg_to_task(TASK_UDP, INSTANCE_DEFAULT, message_p);
-}
-
-static int gtpv1u_s1_req(
- const instance_t instanceP,
- const Gtpv1uS1Req *const req) {
- memcpy(&RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up,
- &req->enb_ip_address_for_S1u_S12_S4_up,
- sizeof (req->enb_ip_address_for_S1u_S12_S4_up));
- gtpv1u_eNB_send_init_udp(req);
- return 0;
-}
-
-//-----------------------------------------------------------------------------
-NwGtpv1uRcT gtpv1u_eNB_log_request(NwGtpv1uLogMgrHandleT hLogMgr,
- uint32_t logLevel,
- NwCharT *file,
- uint32_t line,
- NwCharT *logStr) {
- LOG_D(GTPU, "%s\n", logStr);
- return NW_GTPV1U_OK;
-}
-
-//-----------------------------------------------------------------------------
-NwGtpv1uRcT gtpv1u_eNB_send_udp_msg(
- NwGtpv1uUdpHandleT udpHandle,
- uint8_t *buffer,
- uint32_t buffer_len,
- uint32_t buffer_offset,
- uint32_t peerIpAddr,
- uint16_t peerPort) {
- // Create and alloc new message
- MessageDef *message_p = NULL;
- udp_data_req_t *udp_data_req_p = NULL;
- message_p = itti_alloc_new_message(TASK_GTPV1_U, 0, UDP_DATA_REQ);
-
- if (message_p) {
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- LOG_D(GTPU, "Sending UDP_DATA_REQ length %u offset %u", buffer_len, buffer_offset);
-#endif
- udp_data_req_p = &message_p->ittiMsg.udp_data_req;
- udp_data_req_p->peer_address = peerIpAddr;
- udp_data_req_p->peer_port = peerPort;
- udp_data_req_p->buffer = buffer;
- udp_data_req_p->buffer_length = buffer_len;
- udp_data_req_p->buffer_offset = buffer_offset;
- return itti_send_msg_to_task(TASK_UDP, INSTANCE_DEFAULT, message_p);
- } else {
- return NW_GTPV1U_FAILURE;
- }
-}
-
-
-//-----------------------------------------------------------------------------
-/* Callback called when a gtpv1u message arrived on UDP interface */
-NwGtpv1uRcT gtpv1u_eNB_process_stack_req(
- NwGtpv1uUlpHandleT hUlp,
- NwGtpv1uUlpApiT *pUlpApi) {
- boolean_t result = FALSE;
- teid_t teid = 0;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- gtpv1u_teid_data_t *gtpv1u_teid_data_p = NULL;
- protocol_ctxt_t ctxt;
- NwGtpv1uRcT rc;
-
- switch(pUlpApi->apiType) {
- /* Here there are two type of messages handled:
- * - T-PDU
- * - END-MARKER
- */
- case NW_GTPV1U_ULP_API_RECV_TPDU: {
- uint8_t buffer[NFAPI_MAX_PACKED_MESSAGE_SIZE];
- uint32_t buffer_len;
- struct rrc_eNB_ue_context_s *ue_context_p;
- uint16_t msgType = NW_GTP_GPDU;
- NwGtpv1uMsgT *pMsg = NULL;
- /* Nw-gptv1u stack has processed a PDU. we can schedule it to PDCP
- * for transmission.
- */
- teid = pUlpApi->apiInfo.recvMsgInfo.teid;
- pMsg = (NwGtpv1uMsgT *) pUlpApi->apiInfo.recvMsgInfo.hMsg;
- msgType = pMsg->msgType;
-
- if (NW_GTPV1U_OK != nwGtpv1uMsgGetTpdu(pUlpApi->apiInfo.recvMsgInfo.hMsg,
- buffer, &buffer_len)) {
- LOG_E(GTPU, "Error while retrieving T-PDU");
- }
-
- itti_free(TASK_UDP, ((NwGtpv1uMsgT *)pUlpApi->apiInfo.recvMsgInfo.hMsg)->msgBuf);
-#if defined(GTP_DUMP_SOCKET) && GTP_DUMP_SOCKET > 0
- gtpv1u_eNB_write_dump_socket(buffer,buffer_len);
-#endif
- rc = nwGtpv1uMsgDelete(RC.gtpv1u_data_g->gtpv1u_stack,
- pUlpApi->apiInfo.recvMsgInfo.hMsg);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uMsgDelete failed: 0x%x\n", rc);
- }
-
- //-----------------------
- // GTPV1U->PDCP mapping
- //-----------------------
- hash_rc = hashtable_get(RC.gtpv1u_data_g->teid_mapping, teid, (void **)>pv1u_teid_data_p);
-
- if (hash_rc == HASH_TABLE_OK) {
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- LOG_D(GTPU, "Received T-PDU from gtpv1u stack teid %u size %d -> enb module id %u ue module id %u rab id %u\n",
- teid,
- buffer_len,
- gtpv1u_teid_data_p->enb_id,
- gtpv1u_teid_data_p->ue_id,
- gtpv1u_teid_data_p->eps_bearer_id);
-#endif
- //#warning "LG eps bearer mapping to DRB id to do (offset -4)"
- PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, gtpv1u_teid_data_p->enb_id, ENB_FLAG_YES, gtpv1u_teid_data_p->ue_id, 0, 0,gtpv1u_teid_data_p->enb_id);
- MSC_LOG_TX_MESSAGE(
- MSC_GTPU_ENB,
- MSC_PDCP_ENB,
- NULL,0,
- MSC_AS_TIME_FMT" DATA-REQ rb %u size %u",
- 0,0,
- (gtpv1u_teid_data_p->eps_bearer_id) ? gtpv1u_teid_data_p->eps_bearer_id - 4: 5-4,
- buffer_len);
- ue_context_p = rrc_eNB_get_ue_context(RC.rrc[ctxt.module_id], ctxt.rnti);
-
- if((ue_context_p != NULL) &&
- (ue_context_p->ue_context.handover_info != NULL) &&
- (ue_context_p->ue_context.handover_info->state < HO_FORWARDING_COMPLETE)) {
- if(msgType == NW_GTP_END_MARKER) {
- /* in the source enb, UE in RRC_HO_EXECUTION mode */
- if (ue_context_p->ue_context.StatusRrc == RRC_HO_EXECUTION && ue_context_p->ue_context.handover_info->state == HO_COMPLETE) {
- /* set handover state */
- //ue_context_p->ue_context.handover_info->state = HO_END_MARKER;
- MessageDef *msg;
- // Configure end marker
- msg = itti_alloc_new_message(TASK_GTPV1_U, 0, GTPV1U_ENB_END_MARKER_REQ);
- GTPV1U_ENB_END_MARKER_REQ(msg).buffer = itti_malloc(TASK_GTPV1_U, TASK_GTPV1_U, GTPU_HEADER_OVERHEAD_MAX + buffer_len);
- memcpy(>PV1U_ENB_END_MARKER_REQ(msg).buffer[GTPU_HEADER_OVERHEAD_MAX], buffer, buffer_len);
- GTPV1U_ENB_END_MARKER_REQ(msg).length = buffer_len;
- GTPV1U_ENB_END_MARKER_REQ(msg).rnti = ctxt.rnti;
- GTPV1U_ENB_END_MARKER_REQ(msg).rab_id = gtpv1u_teid_data_p->eps_bearer_id;
- GTPV1U_ENB_END_MARKER_REQ(msg).offset = GTPU_HEADER_OVERHEAD_MAX;
- LOG_I(GTPU, "Send End Marker to GTPV1-U at frame %d and subframe %d \n", ctxt.frame,ctxt.subframe);
- itti_send_msg_to_task(TASK_GTPV1_U, ENB_MODULE_ID_TO_INSTANCE(ctxt.module_id), msg);
- return NW_GTPV1U_OK;
- }
- }
-
- if (ue_context_p->ue_context.StatusRrc == RRC_HO_EXECUTION || ue_context_p->ue_context.StatusRrc == RRC_RECONFIGURED) {
- int msgsrc = gtpv1u_eNB_get_msgsource(ue_context_p, teid);
- LOG_D(GTPU,"UE INFO.ueStatus %d, handover state %d, forwarding state %d, from %s. message type %s\n",
- ue_context_p->ue_context.StatusRrc,
- ue_context_p->ue_context.handover_info->state,
- ue_context_p->ue_context.handover_info->forwarding_state,
- msgsrc == GTPV1U_MSG_FROM_SOURCE_ENB?"Source eNB":"EPC",
- msgsrc != GTPV1U_MSG_FROM_SOURCE_ENB? "UDP DATA" :
- msgType == NW_GTP_END_MARKER?"END MARKER":"DATA FORWARDING");
-
- /* target enb */
- if(msgType == NW_GTP_END_MARKER) {
- LOG_I(GTPU, "target end receive END MARKER\n");
- ue_context_p->ue_context.handover_info->state = HO_END_MARKER;
- gtpv1u_enb_delete_tunnel_req_t delete_tunnel_req;
- memset(&delete_tunnel_req, 0, sizeof(delete_tunnel_req));
- delete_tunnel_req.rnti = ctxt.rnti;
- gtpv1u_delete_x2u_tunnel(ctxt.module_id, &delete_tunnel_req, GTPV1U_TARGET_ENB);
- return NW_GTPV1U_OK;
- }
-
- /* form source eNB message */
- if(msgsrc == GTPV1U_MSG_FROM_SOURCE_ENB) {
- LOG_I(GTPU, "Received a message data forwarding length %d\n", buffer_len);
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- LOG_T(GTPU, "forwarding data info:\n", buffer_len);
-
- for(int i=1; i<=buffer_len; i++) {
- LOG_T(GTPU, "%02x ", buffer[i-1]);
-
- if(i%20 == 0)LOG_T(GTPU, "\n");
- }
-
- LOG_T(GTPU, "\n");
-#endif
- result = gtpv_data_req(
- &ctxt,
- (gtpv1u_teid_data_p->eps_bearer_id) ? gtpv1u_teid_data_p->eps_bearer_id - 4: 5-4,
- 0, // mui
- SDU_CONFIRM_NO, // confirm
- buffer_len,
- buffer,
- PDCP_TRANSMISSION_MODE_DATA,
- TASK_DATA_FORWARDING
- );
-
- if ( result == FALSE ) {
- LOG_W(GTPU, "DATA FORWARDING message save failed\n");
- return NW_GTPV1U_FAILURE;
- }
-
- ue_context_p->ue_context.handover_info->forwarding_state = FORWARDING_NO_EMPTY;
- return NW_GTPV1U_OK;
- }
- /* from epc message */
- else {
- /* in the source enb, UE in RRC_HO_EXECUTION mode */
- if (ue_context_p->ue_context.handover_info->state == HO_COMPLETE) {
- MessageDef *msg;
- // Configure target
- msg = itti_alloc_new_message(TASK_GTPV1_U, 0, GTPV1U_ENB_DATA_FORWARDING_REQ);
- GTPV1U_ENB_DATA_FORWARDING_REQ(msg).buffer = itti_malloc(TASK_GTPV1_U, TASK_GTPV1_U, GTPU_HEADER_OVERHEAD_MAX + buffer_len);
- memcpy(>PV1U_ENB_DATA_FORWARDING_REQ(msg).buffer[GTPU_HEADER_OVERHEAD_MAX], buffer, buffer_len);
- GTPV1U_ENB_DATA_FORWARDING_REQ(msg).length = buffer_len;
- GTPV1U_ENB_DATA_FORWARDING_REQ(msg).rnti = ctxt.rnti;
- GTPV1U_ENB_DATA_FORWARDING_REQ(msg).rab_id = gtpv1u_teid_data_p->eps_bearer_id;
- GTPV1U_ENB_DATA_FORWARDING_REQ(msg).offset = GTPU_HEADER_OVERHEAD_MAX;
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- LOG_T(GTPU, "Send data forwarding sdu_buffer to target enb. len %d info\n", buffer);
-
- for(int i=1; i<=buffer_len; i++) {
- LOG_T(GTPU, "%02x ", buffer[i-1]);
-
- if(i%20 == 0)LOG_T(GTPU, "\n");
- }
-
- LOG_T(GTPU, "\n");
-#endif
- LOG_I(GTPU, "Send data forwarding to GTPV1-U at frame %d and subframe %d \n", ctxt.frame,ctxt.subframe);
- itti_send_msg_to_task(TASK_GTPV1_U, ENB_MODULE_ID_TO_INSTANCE(ctxt.module_id), msg);
- return NW_GTPV1U_OK;
- }
-
- /* target eNB. x2ho forwarding is processing. spgw message save to TASK_END_MARKER */
- if(ue_context_p->ue_context.handover_info->state != HO_COMPLETE &&
- ue_context_p->ue_context.handover_info->state != HO_END_MARKER ) {
- LOG_I(GTPU, "x2ho forwarding is processing. Received a spgw message. length %d\n", buffer_len);
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- LOG_T(GTPU, "spgw data info:\n", buffer_len);
-
- for(int i=1; i<=buffer_len; i++) {
- LOG_T(GTPU, "%02x ", buffer[i-1]);
-
- if(i%20 == 0)LOG_T(GTPU, "\n");
- }
-
- LOG_T(GTPU, "\n");
-#endif
- result = gtpv_data_req(
- &ctxt,
- (gtpv1u_teid_data_p->eps_bearer_id) ? gtpv1u_teid_data_p->eps_bearer_id - 4: 5-4,
- 0, // mui
- SDU_CONFIRM_NO, // confirm
- buffer_len,
- buffer,
- PDCP_TRANSMISSION_MODE_DATA,
- TASK_END_MARKER
- );
-
- if ( result == FALSE ) {
- LOG_W(GTPU, "DATA FORWARDING message save failed\n");
- return NW_GTPV1U_FAILURE;
- }
-
- ue_context_p->ue_context.handover_info->endmark_state = ENDMARK_NO_EMPTY;
- return NW_GTPV1U_OK;
- }
- }
- }
- }
-
- result = pdcp_data_req(
- &ctxt,
- SRB_FLAG_NO,
- (gtpv1u_teid_data_p->eps_bearer_id) ? gtpv1u_teid_data_p->eps_bearer_id - 4: 5-4,
- 0, // mui
- SDU_CONFIRM_NO, // confirm
- buffer_len,
- buffer,
- PDCP_TRANSMISSION_MODE_DATA,NULL, NULL
- );
-
- if ( result == FALSE ) {
- LOG_W(GTPU, "PDCP data request failed\n");
- return NW_GTPV1U_FAILURE;
- }
- } else {
- LOG_W(GTPU, "Received T-PDU from gtpv1u stack teid %u unknown size %u", teid, buffer_len);
- }
- }
- break;
-
- default: {
- LOG_E(GTPU, "Received undefined UlpApi (%02x) from gtpv1u stack!\n",
- pUlpApi->apiType);
- }
- } // end of switch
-
- return NW_GTPV1U_OK;
-}
-
-
-//-----------------------------------------------------------------------------
-int data_recv_callback(uint16_t portP,
- uint32_t address,
- uint8_t *buffer,
- uint32_t length,
- void *arg_p) {
- gtpv1u_data_t *gtpv1u_data_p;
-
- if (arg_p == NULL) {
- return -1;
- }
-
- gtpv1u_data_p = (gtpv1u_data_t *)arg_p;
- return nwGtpv1uProcessUdpReq(gtpv1u_data_p->gtpv1u_stack,
- buffer,
- length,
- portP,
- address);
-}
-
-//int
-//gtpv1u_create_tunnel_endpoint(
-// gtpv1u_data_t *gtpv1u_data_pP,
-// uint8_t ue_idP,
-// uint8_t rab_idP,
-// char *sgw_ip_addr_pP,
-// uint16_t portP)
-//{
-// uint32_t teid;
-// uint8_t max_attempt = 100;
-// NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
-// NwGtpv1uUlpApiT ulp_req;
-// struct gtpv1u_ue_data_s *new_ue_p = NULL;
-// struct gtpv1u_bearer_s *bearer_p = NULL;
-// hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;;
-//
-// if (rab_idP > GTPV1U_MAX_BEARERS_PER_UE) {
-// LOG_E(GTPU, "Could not use rab_id %d > max %d\n",
-// rab_idP, GTPV1U_MAX_BEARERS_PER_UE);
-// return -1;
-// }
-//
-//
-// if ((hash_rc = hashtable_get(gtpv1u_data_pP->ue_mapping, (uint64_t)ue_idP, (void**)&new_ue_p)) == HASH_TABLE_OK) {
-// /* A context for this UE already exist in the tree, use it */
-// /* We check that the tunnel is not already configured */
-// if (new_ue_p->bearers[rab_idP].state != BEARER_DOWN) {
-// LOG_E(GTPU, "Cannot create new end-point over already existing tunnel\n");
-// return -1;
-// }
-// } else {
-// /* Context doesn't exist, create it */
-// if (rab_idP != 0) {
-// /* UE should first establish Default bearer before trying to setup
-// * additional bearers.
-// */
-// LOG_E(GTPU, "UE context is not known and rab_id != 0\n");
-// return -1;
-// }
-// new_ue_p = calloc(1, sizeof(struct gtpv1u_ue_data_s));
-// new_ue_p->ue_id = ue_idP;
-//
-// hash_rc = hashtable_insert(gtpv1u_data_pP->ue_mapping, (uint64_t)ue_idP, new_ue_p);
-//
-// if ((hash_rc != HASH_TABLE_OK) && (hash_rc != HASH_TABLE_INSERT_OVERWRITTEN_DATA)) {
-// LOG_E(GTPU, "Failed to insert new UE context\n");
-// free(new_ue_p);
-// return -1;
-// }
-// }
-//
-// bearer_p = &new_ue_p->bearers[rab_idP];
-//
-// /* Configure the bearer */
-// bearer_p->state = BEARER_IN_CONFIG;
-// bearer_p->sgw_ip_addr = inet_addr(sgw_ip_addr_pP);
-// bearer_p->port = portP;
-//
-// /* Create the new stack api request */
-// memset(&ulp_req, 0, sizeof(NwGtpv1uUlpApiT));
-// ulp_req.apiType = NW_GTPV1U_ULP_API_CREATE_TUNNEL_ENDPOINT;
-//
-// /* Try to create new tunnel-endpoint.
-// * If teid generated is already present in the stack, just peek another random
-// * teid. This could be ok for small number of tunnel but more errors could be
-// * thrown if we reached high number of tunnels.
-// * TODO: find a solution for teid
-// */
-// do {
-// /* Request for a new random TEID */
-// teid = gtpv1u_new_teid();
-// ulp_req.apiInfo.createTunnelEndPointInfo.teid = teid;
-//
-// rc = nwGtpv1uProcessUlpReq(gtpv1u_data_pP->gtpv1u_stack, &ulp_req);
-//
-// if (rc == NW_GTPV1U_OK) {
-//// LOG_D(GTPU, "Successfully created new tunnel endpoint for teid 0x%x\n",
-//// teid);
-// bearer_p->teid_eNB = teid;
-//// gtpv1u_initial_req(gtpv1u_data_pP, teid, GTPV1U_UDP_PORT,
-//// inet_addr("192.168.56.101"));
-// LOG_I(GTPU, "Created eNB tunnel endpoint %u for ue id %u, rab id %u\n", teid, ue_idP, rab_idP);
-// return 0;
-// } else {
-// LOG_W(GTPU, "Teid %u already in use... %s\n",
-// teid, (max_attempt > 1) ? "Trying another one" : "Last chance");
-// }
-// } while(max_attempt-- && rc != NW_GTPV1U_OK);
-//
-// bearer_p->state = BEARER_DOWN;
-// LOG_I(GTPU, "Failed to created eNB tunnel endpoint %u for ue id %u, rab id %u, bearer down\n", teid, ue_idP, rab_idP);
-//
-// return -1;
-//}
-
-
-//-----------------------------------------------------------------------------
-static NwGtpv1uRcT gtpv1u_start_timer_wrapper(
- NwGtpv1uTimerMgrHandleT tmrMgrHandle,
- uint32_t timeoutSec,
- uint32_t timeoutUsec,
- uint32_t tmrType,
- void *timeoutArg,
- NwGtpv1uTimerHandleT *hTmr) {
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- long timer_id;
-
- if (tmrType == NW_GTPV1U_TMR_TYPE_ONE_SHOT) {
- timer_setup(timeoutSec,
- timeoutUsec,
- TASK_GTPV1_U,
- INSTANCE_DEFAULT,
- TIMER_ONE_SHOT,
- timeoutArg,
- &timer_id);
- } else {
- timer_setup(timeoutSec,
- timeoutUsec,
- TASK_GTPV1_U,
- INSTANCE_DEFAULT,
- TIMER_PERIODIC,
- timeoutArg,
- &timer_id);
- }
-
- return rc;
-}
-
-
-//-----------------------------------------------------------------------------
-static NwGtpv1uRcT
-gtpv1u_stop_timer_wrapper(
- NwGtpv1uTimerMgrHandleT tmrMgrHandle,
- NwGtpv1uTimerHandleT hTmr) {
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- return rc;
-}
-
-
-//-----------------------------------------------------------------------------
-int
-gtpv1u_initial_req(
- gtpv1u_data_t *gtpv1u_data_pP,
- teid_t teidP,
- tcp_udp_port_t portP,
- uint32_t address) {
- NwGtpv1uUlpApiT ulp_req;
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- memset(&ulp_req, 0, sizeof(NwGtpv1uUlpApiT));
- ulp_req.apiType = NW_GTPV1U_ULP_API_INITIAL_REQ;
- ulp_req.apiInfo.initialReqInfo.teid = teidP;
- ulp_req.apiInfo.initialReqInfo.peerPort = portP;
- ulp_req.apiInfo.initialReqInfo.peerIp = address;
- rc = nwGtpv1uProcessUlpReq(gtpv1u_data_pP->gtpv1u_stack, &ulp_req);
-
- if (rc == NW_GTPV1U_OK) {
- LOG_D(GTPU, "Successfully sent initial req for teid %u\n", teidP);
- } else {
- LOG_W(GTPU, "Could not send initial req for teid %u\n", teidP);
- }
-
- return (rc == NW_GTPV1U_OK) ? 0 : -1;
-}
-
-//-----------------------------------------------------------------------------
-int
-gtpv1u_new_data_req(
- uint8_t enb_module_idP,
- rnti_t ue_rntiP,
- uint8_t rab_idP,
- uint8_t *buffer_pP,
- uint32_t buf_lenP,
- uint32_t buf_offsetP
-) {
- NwGtpv1uUlpApiT stack_req;
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- struct gtpv1u_ue_data_s ue;
- struct gtpv1u_ue_data_s *ue_inst_p = NULL;
- struct gtpv1u_bearer_s *bearer_p = NULL;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;;
- gtpv1u_data_t *gtpv1u_data_p = NULL;
- memset(&ue, 0, sizeof(struct gtpv1u_ue_data_s));
- ue.ue_id = ue_rntiP;
- AssertFatal(enb_module_idP >=0, "Bad parameter enb module id %u\n", enb_module_idP);
- AssertFatal((rab_idP - GTPV1U_BEARER_OFFSET)< GTPV1U_MAX_BEARERS_ID, "Bad parameter rab id %u\n", rab_idP);
- AssertFatal((rab_idP - GTPV1U_BEARER_OFFSET) >= 0, "Bad parameter rab id %u\n", rab_idP);
- gtpv1u_data_p = RC.gtpv1u_data_g;
- /* Check that UE context is present in ue map. */
- hash_rc = hashtable_get(gtpv1u_data_p->ue_mapping, (uint64_t)ue_rntiP, (void **)&ue_inst_p);
-
- if (hash_rc == HASH_TABLE_KEY_NOT_EXISTS ) {
- LOG_E(GTPU, "[UE %d] Trying to send data on non-existing UE context\n", ue_rntiP);
- return -1;
- }
-
- bearer_p = &ue_inst_p->bearers[rab_idP - GTPV1U_BEARER_OFFSET];
-
- /* Ensure the bearer in ready.
- * TODO: handle the cases where the bearer is in HANDOVER state.
- * In such case packets should be placed in FIFO.
- */
- if (bearer_p->state != BEARER_UP) {
- LOG_W(GTPU, "Trying to send data over bearer with state(%u) != BEARER_UP\n",
- bearer_p->state);
- //#warning LG: HACK WHILE WAITING FOR NAS, normally return -1
-
- if (bearer_p->state != BEARER_IN_CONFIG)
- return -1;
- }
-
- memset(&stack_req, 0, sizeof(NwGtpv1uUlpApiT));
- stack_req.apiType = NW_GTPV1U_ULP_API_SEND_TPDU;
- stack_req.apiInfo.sendtoInfo.teid = bearer_p->teid_sgw;
- stack_req.apiInfo.sendtoInfo.ipAddr = bearer_p->sgw_ip_addr;
- LOG_D(GTPU, "TX TO TEID %u addr 0x%x\n",bearer_p->teid_sgw, bearer_p->sgw_ip_addr);
- rc = nwGtpv1uGpduMsgNew(gtpv1u_data_p->gtpv1u_stack,
- bearer_p->teid_sgw,
- NW_FALSE,
- gtpv1u_data_p->seq_num++,
- buffer_pP,
- buf_lenP,
- buf_offsetP,
- &(stack_req.apiInfo.sendtoInfo.hMsg));
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uGpduMsgNew failed: 0x%x\n", rc);
- return -1;
- }
-
- rc = nwGtpv1uProcessUlpReq(gtpv1u_data_p->gtpv1u_stack,
- &stack_req);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uProcessUlpReq failed: 0x%x\n", rc);
- return -1;
- }
-
- rc = nwGtpv1uMsgDelete(gtpv1u_data_p->gtpv1u_stack,
- stack_req.apiInfo.sendtoInfo.hMsg);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uMsgDelete failed: 0x%x\n", rc);
- return -1;
- }
-
- LOG_D(GTPU, "%s() return code OK\n", __FUNCTION__);
- return 0;
-}
-
-//-----------------------------------------------------------------------------
-int
-gtpv1u_create_x2u_tunnel(
- const instance_t instanceP,
- const gtpv1u_enb_create_x2u_tunnel_req_t *const create_tunnel_req_pP,
- gtpv1u_enb_create_x2u_tunnel_resp_t *const create_tunnel_resp_pP
-) {
- /* Create a new nw-gtpv1-u stack req using API */
- NwGtpv1uUlpApiT stack_req;
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- /* Local tunnel end-point identifier */
- teid_t x2u_teid = 0;
- gtpv1u_teid_data_t *gtpv1u_teid_data_p = NULL;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- int i;
- ebi_t eps_bearer_id = 0;
- MSC_LOG_RX_MESSAGE(
- MSC_GTPU_ENB,
- MSC_RRC_ENB,
- NULL,0,
- MSC_AS_TIME_FMT" CREATE_X2U_TUNNEL_REQ RNTI %"PRIx16" inst %u ntuns %u ebid %u enb-x2u teid %u",
- 0,0,create_tunnel_req_pP->rnti, instanceP,
- create_tunnel_req_pP->num_tunnels, create_tunnel_req_pP->eps_bearer_id[0],
- create_tunnel_req_pP->tenb_X2u_teid[0]);
- create_tunnel_resp_pP->rnti = create_tunnel_req_pP->rnti;
- create_tunnel_resp_pP->status = 0;
- create_tunnel_resp_pP->num_tunnels = 0;
-
- for (i = 0; i < create_tunnel_req_pP->num_tunnels; i++) {
- eps_bearer_id = create_tunnel_req_pP->eps_bearer_id[i];
- LOG_D(GTPU, "Rx GTPV1U_ENB_CREATE_X2U_TUNNEL_REQ ue rnti %x eps bearer id %u\n",
- create_tunnel_req_pP->rnti, eps_bearer_id);
- memset(&stack_req, 0, sizeof(NwGtpv1uUlpApiT));
- stack_req.apiType = NW_GTPV1U_ULP_API_CREATE_TUNNEL_ENDPOINT;
-
- do {
- x2u_teid = gtpv1u_new_teid();
- LOG_D(GTPU, "gtpv1u_create_x2u_tunnel() 0x%x %u(dec)\n", x2u_teid, x2u_teid);
- stack_req.apiInfo.createTunnelEndPointInfo.teid = x2u_teid;
- stack_req.apiInfo.createTunnelEndPointInfo.hUlpSession = 0;
- stack_req.apiInfo.createTunnelEndPointInfo.hStackSession = 0;
- rc = nwGtpv1uProcessUlpReq(RC.gtpv1u_data_g->gtpv1u_stack, &stack_req);
- LOG_D(GTPU, ".\n");
- } while (rc != NW_GTPV1U_OK);
-
- memcpy(&create_tunnel_resp_pP->enb_addr.buffer,
- &RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up,
- sizeof (in_addr_t));
- LOG_D(GTPU, "gtpv1u_create_x2u_tunnel() end addr %d.%d.%d.%d\n",
- create_tunnel_resp_pP->enb_addr.buffer[0],
- create_tunnel_resp_pP->enb_addr.buffer[1],
- create_tunnel_resp_pP->enb_addr.buffer[2],
- create_tunnel_resp_pP->enb_addr.buffer[3]);
- create_tunnel_resp_pP->enb_addr.length = sizeof (in_addr_t);
- create_tunnel_resp_pP->eps_bearer_id[i] = eps_bearer_id;
- create_tunnel_resp_pP->num_tunnels += 1;
- //-----------------------
- // GTPV1U->PDCP mapping
- //-----------------------
- create_tunnel_resp_pP->enb_X2u_teid[i] = x2u_teid;
- hash_rc = hashtable_get(RC.gtpv1u_data_g->teid_mapping, x2u_teid, (void **)>pv1u_teid_data_p);
-
- if (hash_rc == HASH_TABLE_KEY_NOT_EXISTS) {
- gtpv1u_teid_data_p = calloc (1, sizeof(gtpv1u_teid_data_t));
- gtpv1u_teid_data_p->enb_id = 0; // TO DO
- gtpv1u_teid_data_p->ue_id = create_tunnel_req_pP->rnti;
- gtpv1u_teid_data_p->eps_bearer_id = eps_bearer_id;
- hash_rc = hashtable_insert(RC.gtpv1u_data_g->teid_mapping, x2u_teid, gtpv1u_teid_data_p);
- AssertFatal(hash_rc == HASH_TABLE_OK, "Error inserting teid mapping in GTPV1U hashtable");
- } else {
- create_tunnel_resp_pP->enb_X2u_teid[i] = 0;
- create_tunnel_resp_pP->status = 0xFF;
- }
- }
-
- MSC_LOG_TX_MESSAGE(
- MSC_GTPU_ENB,
- MSC_RRC_ENB,
- NULL,0,
- "0 GTPV1U_ENB_CREATE_TUNNEL_RESP rnti %x teid %x",
- create_tunnel_resp_pP->rnti,
- x2u_teid);
- LOG_D(GTPU, "Tx GTPV1U_ENB_CREATE_TUNNEL_RESP ue rnti %x status %d\n",
- create_tunnel_req_pP->rnti,
- create_tunnel_resp_pP->status);
- return 0;
-}
-
-//-----------------------------------------------------------------------------
-int gtpv1u_delete_x2u_tunnel(
- const instance_t instanceP,
- const gtpv1u_enb_delete_tunnel_req_t *const req_pP,
- int enbflag) {
- gtpv1u_ue_data_t *gtpv1u_ue_data_p = NULL;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- int erab_index = 0;
- ebi_t eps_bearer_id = 0;
- struct rrc_eNB_ue_context_s *ue_context_p = NULL;
- ue_context_p = rrc_eNB_get_ue_context(RC.rrc[instanceP], req_pP->rnti);
-
- if(ue_context_p != NULL) {
- /* in the source enb */
- if(enbflag == GTPV1U_SOURCE_ENB) {
- hash_rc = hashtable_get(RC.gtpv1u_data_g->ue_mapping, req_pP->rnti, (void **)>pv1u_ue_data_p);
-
- if (hash_rc == HASH_TABLE_OK) {
- for (erab_index = 0; erab_index < ue_context_p->ue_context.nb_x2u_e_rabs; erab_index++) {
- eps_bearer_id = ue_context_p->ue_context.enb_gtp_x2u_ebi[erab_index];
- LOG_I(GTPU, "gtpv1u_delete_x2u_tunnel user rnti %x teNB X2U teid %u eps bearer id %ld\n",
- req_pP->rnti,
- gtpv1u_ue_data_p->bearers[eps_bearer_id - GTPV1U_BEARER_OFFSET].teid_teNB,
- ue_context_p->ue_context.enb_gtp_x2u_ebi[erab_index]);
- gtpv1u_ue_data_p->bearers[eps_bearer_id - GTPV1U_BEARER_OFFSET].teid_teNB = 0;
- gtpv1u_ue_data_p->bearers[eps_bearer_id - GTPV1U_BEARER_OFFSET].tenb_ip_addr = 0;
- //gtpv1u_ue_data_p->bearers[eps_bearer_id - GTPV1U_BEARER_OFFSET].tenb_ip6_addr = 0;
- }
-
- ue_context_p->ue_context.nb_x2u_e_rabs = 0;
- }
- }
- /* in the target enb */
- else {
- for (erab_index = 0; erab_index < ue_context_p->ue_context.nb_x2u_e_rabs; erab_index++) {
- //-----------------------
- // GTPV1U->PDCP mapping
- //-----------------------
- hash_rc = hashtable_remove(RC.gtpv1u_data_g->teid_mapping, ue_context_p->ue_context.enb_gtp_x2u_teid[erab_index]);
- LOG_I(GTPU, "Removed user rnti %x , enb X2U teid %u\n", req_pP->rnti, ue_context_p->ue_context.enb_gtp_x2u_teid[erab_index]);
-
- if (hash_rc != HASH_TABLE_OK) {
- LOG_D(GTPU, "Removed user rnti %x , enb X2U teid %u not found\n", req_pP->rnti, ue_context_p->ue_context.enb_gtp_x2u_teid[erab_index]);
- }
- }
-
- ue_context_p->ue_context.nb_x2u_e_rabs = 0;
- }
- }
-
- return 0;
-}
-
-//-----------------------------------------------------------------------------
-int
-gtpv1u_create_s1u_tunnel(
- const instance_t instanceP,
- const gtpv1u_enb_create_tunnel_req_t *const create_tunnel_req_pP,
- gtpv1u_enb_create_tunnel_resp_t *const create_tunnel_resp_pP
-) {
- /* Create a new nw-gtpv1-u stack req using API */
- NwGtpv1uUlpApiT stack_req;
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- /* Local tunnel end-point identifier */
- teid_t s1u_teid = 0;
- gtpv1u_teid_data_t *gtpv1u_teid_data_p = NULL;
- gtpv1u_ue_data_t *gtpv1u_ue_data_p = NULL;
- //MessageDef *message_p = NULL;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- int i;
- ebi_t eps_bearer_id = 0;
- // int ipv4_addr = 0;
- int ip_offset = 0;
- in_addr_t in_addr;
- int addrs_length_in_bytes= 0;
- int loop_counter = 0;
- int ret = 0;
- MSC_LOG_RX_MESSAGE(
- MSC_GTPU_ENB,
- MSC_RRC_ENB,
- NULL,0,
- MSC_AS_TIME_FMT" CREATE_TUNNEL_REQ RNTI %"PRIx16" inst %u ntuns %u ebid %u sgw-s1u teid %u",
- 0,0,create_tunnel_req_pP->rnti, instanceP,
- create_tunnel_req_pP->num_tunnels, create_tunnel_req_pP->eps_bearer_id[0],
- create_tunnel_req_pP->sgw_S1u_teid[0]);
- create_tunnel_resp_pP->rnti = create_tunnel_req_pP->rnti;
- create_tunnel_resp_pP->status = 0;
- create_tunnel_resp_pP->num_tunnels = 0;
-
- for (i = 0; i < create_tunnel_req_pP->num_tunnels; i++) {
- ip_offset = 0;
- loop_counter = 0;
- eps_bearer_id = create_tunnel_req_pP->eps_bearer_id[i];
- LOG_D(GTPU, "Rx GTPV1U_ENB_CREATE_TUNNEL_REQ ue rnti %x eps bearer id %u\n",
- create_tunnel_req_pP->rnti, eps_bearer_id);
- memset(&stack_req, 0, sizeof(NwGtpv1uUlpApiT));
- stack_req.apiType = NW_GTPV1U_ULP_API_CREATE_TUNNEL_ENDPOINT;
-
- do {
- s1u_teid = gtpv1u_new_teid();
- LOG_I(GTPU, "gtpv1u_data_g %p\n", RC.gtpv1u_data_g);
- LOG_I(GTPU, "gtpv1u_create_s1u_tunnel() 0x%x %u(dec)\n", s1u_teid, s1u_teid);
- stack_req.apiInfo.createTunnelEndPointInfo.teid = s1u_teid;
- stack_req.apiInfo.createTunnelEndPointInfo.hUlpSession = 0;
- stack_req.apiInfo.createTunnelEndPointInfo.hStackSession = 0;
- rc = nwGtpv1uProcessUlpReq(RC.gtpv1u_data_g->gtpv1u_stack, &stack_req);
- LOG_D(GTPU, ".\n");
- loop_counter++;
- } while (rc != NW_GTPV1U_OK && loop_counter < 10);
-
- if ( rc != NW_GTPV1U_OK && loop_counter == 10 ) {
- LOG_E(GTPU,"NwGtpv1uCreateTunnelEndPoint failed 10 times,start next loop\n");
- ret = -1;
- continue;
- }
-
- //-----------------------
- // PDCP->GTPV1U mapping
- //-----------------------
- hash_rc = hashtable_get(RC.gtpv1u_data_g->ue_mapping, create_tunnel_req_pP->rnti, (void **)>pv1u_ue_data_p);
-
- if ((hash_rc == HASH_TABLE_KEY_NOT_EXISTS) || (hash_rc == HASH_TABLE_OK)) {
- if (hash_rc == HASH_TABLE_KEY_NOT_EXISTS) {
- gtpv1u_ue_data_p = calloc (1, sizeof(gtpv1u_ue_data_t));
- hash_rc = hashtable_insert(RC.gtpv1u_data_g->ue_mapping, create_tunnel_req_pP->rnti, gtpv1u_ue_data_p);
- AssertFatal(hash_rc == HASH_TABLE_OK, "Error inserting ue_mapping in GTPV1U hashtable");
- }
-
- gtpv1u_ue_data_p->ue_id = create_tunnel_req_pP->rnti;
- gtpv1u_ue_data_p->instance_id = 0; // TO DO
- memcpy(&create_tunnel_resp_pP->enb_addr.buffer,
- &RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up,
- sizeof (in_addr_t));
-
- LOG_I(GTPU,"Configured GTPu address : %x\n",RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up);
- create_tunnel_resp_pP->enb_addr.length = sizeof (in_addr_t);
- addrs_length_in_bytes = create_tunnel_req_pP->sgw_addr[i].length / 8;
- AssertFatal((addrs_length_in_bytes == 4) ||
- (addrs_length_in_bytes == 16) ||
- (addrs_length_in_bytes == 20),
- "Bad transport layer address length %d (bits) %d (bytes)",
- create_tunnel_req_pP->sgw_addr[i].length, addrs_length_in_bytes);
-
- if ((addrs_length_in_bytes == 4) ||
- (addrs_length_in_bytes == 20)) {
- in_addr = *((in_addr_t *)create_tunnel_req_pP->sgw_addr[i].buffer);
- ip_offset = 4;
- gtpv1u_ue_data_p->bearers[eps_bearer_id - GTPV1U_BEARER_OFFSET].sgw_ip_addr = in_addr;
- }
-
- if ((addrs_length_in_bytes == 16) ||
- (addrs_length_in_bytes == 20)) {
- memcpy(gtpv1u_ue_data_p->bearers[eps_bearer_id - GTPV1U_BEARER_OFFSET].sgw_ip6_addr.s6_addr,
- &create_tunnel_req_pP->sgw_addr[i].buffer[ip_offset],
- 16);
- }
-
- gtpv1u_ue_data_p->bearers[eps_bearer_id - GTPV1U_BEARER_OFFSET].state = BEARER_IN_CONFIG;
- gtpv1u_ue_data_p->bearers[eps_bearer_id - GTPV1U_BEARER_OFFSET].teid_eNB = s1u_teid;
- gtpv1u_ue_data_p->bearers[eps_bearer_id - GTPV1U_BEARER_OFFSET].teid_eNB_stack_session = stack_req.apiInfo.createTunnelEndPointInfo.hStackSession;
- gtpv1u_ue_data_p->bearers[eps_bearer_id - GTPV1U_BEARER_OFFSET].teid_sgw = create_tunnel_req_pP->sgw_S1u_teid[i];
- gtpv1u_ue_data_p->num_bearers++;
- create_tunnel_resp_pP->enb_S1u_teid[i] = s1u_teid;
-
- LOG_I(GTPU,"Copied to create_tunnel_resp tunnel: index %d target gNB ip %d.%d.%d.%d length %d gtp teid %u\n",
- i,
- create_tunnel_resp_pP->enb_addr.buffer[0],
- create_tunnel_resp_pP->enb_addr.buffer[1],
- create_tunnel_resp_pP->enb_addr.buffer[2],
- create_tunnel_resp_pP->enb_addr.buffer[3],
- create_tunnel_resp_pP->enb_addr.length,
- create_tunnel_resp_pP->enb_S1u_teid[i]);
- } else {
- create_tunnel_resp_pP->enb_S1u_teid[i] = 0;
- create_tunnel_resp_pP->status = 0xFF;
- }
-
- create_tunnel_resp_pP->eps_bearer_id[i] = eps_bearer_id;
- create_tunnel_resp_pP->num_tunnels += 1;
- //-----------------------
- // GTPV1U->PDCP mapping
- //-----------------------
- hash_rc = hashtable_get(RC.gtpv1u_data_g->teid_mapping, s1u_teid, (void **)>pv1u_teid_data_p);
-
- if (hash_rc == HASH_TABLE_KEY_NOT_EXISTS) {
- gtpv1u_teid_data_p = calloc (1, sizeof(gtpv1u_teid_data_t));
- gtpv1u_teid_data_p->enb_id = 0; // TO DO
- gtpv1u_teid_data_p->ue_id = create_tunnel_req_pP->rnti;
- gtpv1u_teid_data_p->eps_bearer_id = eps_bearer_id;
- hash_rc = hashtable_insert(RC.gtpv1u_data_g->teid_mapping, s1u_teid, gtpv1u_teid_data_p);
- AssertFatal(hash_rc == HASH_TABLE_OK, "Error inserting teid mapping in GTPV1U hashtable");
- } else {
- create_tunnel_resp_pP->enb_S1u_teid[i] = 0;
- create_tunnel_resp_pP->status = 0xFF;
- }
- }
-
- MSC_LOG_TX_MESSAGE(
- MSC_GTPU_ENB,
- MSC_RRC_ENB,
- NULL,0,
- "0 GTPV1U_ENB_CREATE_TUNNEL_RESP rnti %x teid %x",
- create_tunnel_resp_pP->rnti,
- s1u_teid);
- LOG_D(GTPU, "Tx GTPV1U_ENB_CREATE_TUNNEL_RESP ue rnti %x status %d\n",
- create_tunnel_req_pP->rnti,
- create_tunnel_resp_pP->status);
- //return 0;
- return ret;
-}
-
-int gtpv1u_update_s1u_tunnel(
- const instance_t instanceP,
- const gtpv1u_enb_create_tunnel_req_t *const create_tunnel_req_pP,
- const rnti_t prior_rnti
-) {
- /* Local tunnel end-point identifier */
- teid_t s1u_teid = 0;
- gtpv1u_teid_data_t *gtpv1u_teid_data_p = NULL;
- gtpv1u_ue_data_t *gtpv1u_ue_data_p = NULL;
- gtpv1u_ue_data_t *gtpv1u_ue_data_new_p = NULL;
- //MessageDef *message_p = NULL;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- int i,j;
- uint8_t bearers_num = 0,bearers_total = 0;
- //-----------------------
- // PDCP->GTPV1U mapping
- //-----------------------
- hash_rc = hashtable_get(RC.gtpv1u_data_g->ue_mapping, prior_rnti, (void **)>pv1u_ue_data_p);
-
- if(hash_rc != HASH_TABLE_OK) {
- LOG_E(GTPU,"Error get ue_mapping(rnti=%x) from GTPV1U hashtable error\n", prior_rnti);
- return -1;
- }
-
- gtpv1u_ue_data_new_p = calloc (1, sizeof(gtpv1u_ue_data_t));
- memcpy(gtpv1u_ue_data_new_p,gtpv1u_ue_data_p,sizeof(gtpv1u_ue_data_t));
- gtpv1u_ue_data_new_p->ue_id = create_tunnel_req_pP->rnti;
- hash_rc = hashtable_insert(RC.gtpv1u_data_g->ue_mapping, create_tunnel_req_pP->rnti, gtpv1u_ue_data_new_p);
-
- //AssertFatal(hash_rc == HASH_TABLE_OK, "Error inserting ue_mapping in GTPV1U hashtable");
- if ( hash_rc != HASH_TABLE_OK ) {
- LOG_E(GTPU,"Failed to insert ue_mapping(rnti=%x) in GTPV1U hashtable\n",create_tunnel_req_pP->rnti);
- return -1;
- } else {
- LOG_I(GTPU, "inserting ue_mapping(rnti=%x) in GTPV1U hashtable\n",
- create_tunnel_req_pP->rnti);
- }
-
- hash_rc = hashtable_remove(RC.gtpv1u_data_g->ue_mapping, prior_rnti);
- LOG_I(GTPU, "hashtable_remove ue_mapping(rnti=%x) in GTPV1U hashtable\n",
- prior_rnti);
- //-----------------------
- // GTPV1U->PDCP mapping
- //-----------------------
- bearers_total =gtpv1u_ue_data_new_p->num_bearers;
-
- for(j = 0; j<GTPV1U_MAX_BEARERS_ID; j++) {
- if(gtpv1u_ue_data_new_p->bearers[j].state != BEARER_IN_CONFIG)
- continue;
-
- bearers_num++;
-
- for (i = 0; i < create_tunnel_req_pP->num_tunnels; i++) {
- if(j == (create_tunnel_req_pP->eps_bearer_id[i]-GTPV1U_BEARER_OFFSET))
- break;
- }
-
- if(i < create_tunnel_req_pP->num_tunnels) {
- s1u_teid = gtpv1u_ue_data_new_p->bearers[j].teid_eNB;
- hash_rc = hashtable_get(RC.gtpv1u_data_g->teid_mapping, s1u_teid, (void **)>pv1u_teid_data_p);
-
- if (hash_rc == HASH_TABLE_OK) {
- gtpv1u_teid_data_p->ue_id = create_tunnel_req_pP->rnti;
- gtpv1u_teid_data_p->eps_bearer_id = create_tunnel_req_pP->eps_bearer_id[i];
- LOG_I(GTPU, "updata teid_mapping te_id %u (prior_rnti %x rnti %x) in GTPV1U hashtable\n",
- s1u_teid,prior_rnti,create_tunnel_req_pP->rnti);
- } else {
- LOG_W(GTPU, "Error get teid mapping(s1u_teid=%u) from GTPV1U hashtable", s1u_teid);
- }
- } else {
- s1u_teid = gtpv1u_ue_data_new_p->bearers[j].teid_eNB;
- hash_rc = hashtable_remove(RC.gtpv1u_data_g->teid_mapping, s1u_teid);
-
- if (hash_rc != HASH_TABLE_OK) {
- LOG_D(GTPU, "Removed user rnti %x , enb S1U teid %u not found\n", prior_rnti, s1u_teid);
- }
-
- gtpv1u_ue_data_new_p->bearers[j].state = BEARER_DOWN;
- gtpv1u_ue_data_new_p->num_bearers--;
- LOG_I(GTPU, "delete teid_mapping te_id %u (rnti%x) bearer_id %d in GTPV1U hashtable\n",
- s1u_teid,prior_rnti,j+GTPV1U_BEARER_OFFSET);;
- }
-
- if(bearers_num > bearers_total)
- break;
- }
-
- return 0;
-}
-
-//-----------------------------------------------------------------------------
-int gtpv1u_delete_s1u_tunnel(
- const instance_t instanceP,
- const gtpv1u_enb_delete_tunnel_req_t *const req_pP) {
- NwGtpv1uUlpApiT stack_req;
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- MessageDef *message_p = NULL;
- gtpv1u_ue_data_t *gtpv1u_ue_data_p = NULL;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- teid_t teid_eNB = 0;
- int erab_index = 0;
- message_p = itti_alloc_new_message(TASK_GTPV1_U, 0, GTPV1U_ENB_DELETE_TUNNEL_RESP);
- GTPV1U_ENB_DELETE_TUNNEL_RESP(message_p).rnti = req_pP->rnti;
- GTPV1U_ENB_DELETE_TUNNEL_RESP(message_p).status = 0;
- hash_rc = hashtable_get(RC.gtpv1u_data_g->ue_mapping, req_pP->rnti, (void **)>pv1u_ue_data_p);
-
- if (hash_rc == HASH_TABLE_OK) {
- for (erab_index = 0; erab_index < req_pP->num_erab; erab_index++) {
- teid_eNB = gtpv1u_ue_data_p->bearers[req_pP->eps_bearer_id[erab_index] - GTPV1U_BEARER_OFFSET].teid_eNB;
- LOG_D(GTPU, "Rx GTPV1U_ENB_DELETE_TUNNEL user rnti %x eNB S1U teid %u eps bearer id %u\n",
- req_pP->rnti, teid_eNB, req_pP->eps_bearer_id[erab_index]);
- {
- memset(&stack_req, 0, sizeof(NwGtpv1uUlpApiT));
- stack_req.apiType = NW_GTPV1U_ULP_API_DESTROY_TUNNEL_ENDPOINT;
- LOG_D(GTPU, "gtpv1u_delete_s1u_tunnel erab %u %u\n",
- req_pP->eps_bearer_id[erab_index],
- teid_eNB);
- stack_req.apiInfo.destroyTunnelEndPointInfo.hStackSessionHandle = gtpv1u_ue_data_p->bearers[req_pP->eps_bearer_id[erab_index] - GTPV1U_BEARER_OFFSET].teid_eNB_stack_session;
- rc = nwGtpv1uProcessUlpReq(RC.gtpv1u_data_g->gtpv1u_stack, &stack_req);
- LOG_D(GTPU, ".\n");
- }
-
- if (rc != NW_GTPV1U_OK) {
- GTPV1U_ENB_DELETE_TUNNEL_RESP(message_p).status |= 0xFF;
- LOG_E(GTPU, "NW_GTPV1U_ULP_API_DESTROY_TUNNEL_ENDPOINT failed");
- }
-
- //-----------------------
- // PDCP->GTPV1U mapping
- //-----------------------
- gtpv1u_ue_data_p->bearers[req_pP->eps_bearer_id[erab_index] - GTPV1U_BEARER_OFFSET].state = BEARER_DOWN;
- gtpv1u_ue_data_p->bearers[req_pP->eps_bearer_id[erab_index] - GTPV1U_BEARER_OFFSET].teid_eNB = 0;
- gtpv1u_ue_data_p->bearers[req_pP->eps_bearer_id[erab_index] - GTPV1U_BEARER_OFFSET].teid_sgw = 0;
- gtpv1u_ue_data_p->bearers[req_pP->eps_bearer_id[erab_index] - GTPV1U_BEARER_OFFSET].sgw_ip_addr = 0;
- gtpv1u_ue_data_p->num_bearers -= 1;
-
- if (gtpv1u_ue_data_p->num_bearers == 0) {
- hash_rc = hashtable_remove(RC.gtpv1u_data_g->ue_mapping, req_pP->rnti);
- LOG_D(GTPU, "Removed user rnti %x,no more bearers configured\n", req_pP->rnti);
- }
-
- //-----------------------
- // GTPV1U->PDCP mapping
- //-----------------------
- hash_rc = hashtable_remove(RC.gtpv1u_data_g->teid_mapping, teid_eNB);
-
- if (hash_rc != HASH_TABLE_OK) {
- LOG_D(GTPU, "Removed user rnti %x , enb S1U teid %u not found\n", req_pP->rnti, teid_eNB);
- }
- }
- }// else silently do nothing
-
- LOG_D(GTPU, "Tx GTPV1U_ENB_DELETE_TUNNEL_RESP user rnti %x eNB S1U teid %u status %u\n",
- GTPV1U_ENB_DELETE_TUNNEL_RESP(message_p).rnti,
- GTPV1U_ENB_DELETE_TUNNEL_RESP(message_p).enb_S1u_teid,
- GTPV1U_ENB_DELETE_TUNNEL_RESP(message_p).status);
- MSC_LOG_TX_MESSAGE(
- MSC_GTPU_ENB,
- MSC_RRC_ENB,
- NULL,0,
- "0 GTPV1U_ENB_DELETE_TUNNEL_RESP rnti %x teid %x",
- GTPV1U_ENB_DELETE_TUNNEL_RESP(message_p).rnti,
- teid_eNB);
- if (req_pP->from_gnb)
- return itti_send_msg_to_task(TASK_RRC_GNB, instanceP, message_p);
- else
- return itti_send_msg_to_task(TASK_RRC_ENB, instanceP, message_p);
-}
-
-
-//-----------------------------------------------------------------------------
-int gtpv1u_eNB_init(void) {
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uUlpEntityT ulp;
- NwGtpv1uUdpEntityT udp;
- NwGtpv1uLogMgrEntityT log;
- NwGtpv1uTimerMgrEntityT tmr;
- // enb_properties_p = enb_config_get()->properties[0];
- RC.gtpv1u_data_g = (gtpv1u_data_t *)calloc(sizeof(gtpv1u_data_t),1);
- LOG_I(GTPU, "Initializing GTPU stack %p\n",&RC.gtpv1u_data_g);
- //gtpv1u_data_g.gtpv1u_stack;
- /* Initialize UE hashtable */
- RC.gtpv1u_data_g->ue_mapping = hashtable_create (32, NULL, NULL);
- AssertFatal(RC.gtpv1u_data_g->ue_mapping != NULL, " ERROR Initializing TASK_GTPV1_U task interface: in hashtable_create returned %p\n", RC.gtpv1u_data_g->ue_mapping);
- RC.gtpv1u_data_g->teid_mapping = hashtable_create (256, NULL, NULL);
- AssertFatal(RC.gtpv1u_data_g->teid_mapping != NULL, " ERROR Initializing TASK_GTPV1_U task interface: in hashtable_create\n");
- // RC.gtpv1u_data_g.enb_ip_address_for_S1u_S12_S4_up = enb_properties_p->enb_ipv4_address_for_S1U;
- //gtpv1u_data_g.udp_data;
- RC.gtpv1u_data_g->seq_num = 0;
- RC.gtpv1u_data_g->restart_counter = 0;
- RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up = 0;
- /* Initializing GTPv1-U stack */
- if ((rc = nwGtpv1uInitialize(&RC.gtpv1u_data_g->gtpv1u_stack, GTPU_STACK_ENB)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "Failed to setup nwGtpv1u stack %x\n", rc);
- return -1;
- }
-
- if ((rc = nwGtpv1uSetLogLevel(RC.gtpv1u_data_g->gtpv1u_stack,
- NW_LOG_LEVEL_DEBG)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "Failed to setup loglevel for stack %x\n", rc);
- return -1;
- }
-
- /* Set the ULP API callback. Called once message have been processed by the
- * nw-gtpv1u stack.
- */
- ulp.ulpReqCallback = gtpv1u_eNB_process_stack_req;
- memset((void *)&(ulp.hUlp), 0, sizeof(NwGtpv1uUlpHandleT));
-
- if ((rc = nwGtpv1uSetUlpEntity(RC.gtpv1u_data_g->gtpv1u_stack, &ulp)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uSetUlpEntity: %x", rc);
- return -1;
- }
-
- /* nw-gtpv1u stack requires an udp callback to send data over UDP.
- * We provide a wrapper to UDP task.
- */
- udp.udpDataReqCallback = gtpv1u_eNB_send_udp_msg;
- memset((void *)&(udp.hUdp), 0, sizeof(NwGtpv1uUdpHandleT));
-
- if ((rc = nwGtpv1uSetUdpEntity(RC.gtpv1u_data_g->gtpv1u_stack, &udp)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uSetUdpEntity: %x", rc);
- return -1;
- }
-
- log.logReqCallback = gtpv1u_eNB_log_request;
- memset((void *)&(log.logMgrHandle), 0, sizeof(NwGtpv1uLogMgrHandleT));
-
- if ((rc = nwGtpv1uSetLogMgrEntity(RC.gtpv1u_data_g->gtpv1u_stack, &log)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uSetLogMgrEntity: %x", rc);
- return -1;
- }
-
- /* Timer interface is more complicated as both wrappers doesn't send a message
- * to the timer task but call the timer API functions start/stop timer.
- */
- tmr.tmrMgrHandle = 0;
- tmr.tmrStartCallback = gtpv1u_start_timer_wrapper;
- tmr.tmrStopCallback = gtpv1u_stop_timer_wrapper;
-
- if ((rc = nwGtpv1uSetTimerMgrEntity(RC.gtpv1u_data_g->gtpv1u_stack, &tmr)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uSetTimerMgrEntity: %x", rc);
- return -1;
- }
-
-#if defined(GTP_DUMP_SOCKET) && GTP_DUMP_SOCKET > 0
-
- if ((ret = gtpv1u_eNB_create_dump_socket()) < 0) {
- return -1;
- }
-
-#endif
- LOG_D(GTPU, "Initializing GTPV1U interface for eNB: DONE\n");
- return 0;
-}
-
-//-----------------------------------------------------------------------------
-void *gtpv1u_eNB_process_itti_msg(void *notUsed) {
- /* Trying to fetch a message from the message queue.
- * If the queue is empty, this function will block till a
- * message is sent to the task.
- */
- instance_t instance;
- MessageDef *received_message_p = NULL;
- int rc = 0;
- itti_receive_msg(TASK_GTPV1_U, &received_message_p);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_ENB_TASK, VCD_FUNCTION_IN);
- DevAssert(received_message_p != NULL);
- instance = ITTI_MSG_DESTINATION_INSTANCE(received_message_p);
- //msg_name_p = ITTI_MSG_NAME(received_message_p);
-
- switch (ITTI_MSG_ID(received_message_p)) {
- case GTPV1U_ENB_S1_REQ:
- gtpv1u_s1_req(instance, &received_message_p->ittiMsg.gtpv1uS1Req);
-
- case GTPV1U_ENB_DELETE_TUNNEL_REQ: {
- gtpv1u_delete_s1u_tunnel(instance, &received_message_p->ittiMsg.Gtpv1uDeleteTunnelReq);
- }
- break;
-
- // DATA COMING FROM UDP
- case UDP_DATA_IND: {
- udp_data_ind_t *udp_data_ind_p;
- udp_data_ind_p = &received_message_p->ittiMsg.udp_data_ind;
- nwGtpv1uProcessUdpReq(RC.gtpv1u_data_g->gtpv1u_stack,
- udp_data_ind_p->buffer,
- udp_data_ind_p->buffer_length,
- udp_data_ind_p->peer_port,
- udp_data_ind_p->peer_address);
- //itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), udp_data_ind_p->buffer);
- }
- break;
-
- // DATA TO BE SENT TO UDP
- case GTPV1U_ENB_TUNNEL_DATA_REQ: {
- gtpv1u_enb_tunnel_data_req_t *data_req_p = NULL;
- NwGtpv1uUlpApiT stack_req;
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- gtpv1u_ue_data_t *gtpv1u_ue_data_p = NULL;
- teid_t enb_s1u_teid = 0;
- teid_t sgw_s1u_teid = 0;
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_PROCESS_TUNNEL_DATA_REQ, VCD_FUNCTION_IN);
- data_req_p = >PV1U_ENB_TUNNEL_DATA_REQ(received_message_p);
- //ipv4_send_data(ipv4_data_p->sd, data_ind_p->buffer, data_ind_p->length);
-#if defined(GTP_DUMP_SOCKET) && GTP_DUMP_SOCKET > 0
- gtpv1u_eNB_write_dump_socket(&data_req_p->buffer[data_req_p->offset],data_req_p->length);
-#endif
- memset(&stack_req, 0, sizeof(NwGtpv1uUlpApiT));
- hash_rc = hashtable_get(RC.gtpv1u_data_g->ue_mapping, (uint64_t)data_req_p->rnti, (void **)>pv1u_ue_data_p);
-
- if (hash_rc == HASH_TABLE_KEY_NOT_EXISTS) {
- LOG_E(GTPU, "nwGtpv1uProcessUlpReq failed: while getting ue rnti %x in hashtable ue_mapping\n", data_req_p->rnti);
- } else {
- if ((data_req_p->rab_id >= GTPV1U_BEARER_OFFSET) && (data_req_p->rab_id < max_val_LTE_DRB_Identity)) {
- enb_s1u_teid = gtpv1u_ue_data_p->bearers[data_req_p->rab_id - GTPV1U_BEARER_OFFSET].teid_eNB;
- sgw_s1u_teid = gtpv1u_ue_data_p->bearers[data_req_p->rab_id - GTPV1U_BEARER_OFFSET].teid_sgw;
- stack_req.apiType = NW_GTPV1U_ULP_API_SEND_TPDU;
- stack_req.apiInfo.sendtoInfo.teid = sgw_s1u_teid;
- stack_req.apiInfo.sendtoInfo.ipAddr = gtpv1u_ue_data_p->bearers[data_req_p->rab_id - GTPV1U_BEARER_OFFSET].sgw_ip_addr;
- rc = nwGtpv1uGpduMsgNew(
- RC.gtpv1u_data_g->gtpv1u_stack,
- sgw_s1u_teid,
- NW_FALSE,
- RC.gtpv1u_data_g->seq_num++,
- data_req_p->buffer,
- data_req_p->length,
- data_req_p->offset,
- &(stack_req.apiInfo.sendtoInfo.hMsg));
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uGpduMsgNew failed: 0x%x\n", rc);
- MSC_LOG_EVENT(MSC_GTPU_ENB,"0 Failed send G-PDU ltid %u rtid %u size %u",
- enb_s1u_teid,sgw_s1u_teid,data_req_p->length);
- (void)enb_s1u_teid; /* avoid gcc warning "set but not used" */
- } else {
- rc = nwGtpv1uProcessUlpReq(RC.gtpv1u_data_g->gtpv1u_stack, &stack_req);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uProcessUlpReq failed: 0x%x\n", rc);
- MSC_LOG_EVENT(MSC_GTPU_ENB,"0 Failed send G-PDU ltid %u rtid %u size %u",
- enb_s1u_teid,sgw_s1u_teid,data_req_p->length);
- } else {
- MSC_LOG_TX_MESSAGE(
- MSC_GTPU_ENB,
- MSC_GTPU_SGW,
- NULL,
- 0,
- MSC_AS_TIME_FMT" G-PDU ltid %u rtid %u size %u",
- 0,0,
- enb_s1u_teid,
- sgw_s1u_teid,
- data_req_p->length);
- }
-
- rc = nwGtpv1uMsgDelete(RC.gtpv1u_data_g->gtpv1u_stack,
- stack_req.apiInfo.sendtoInfo.hMsg);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uMsgDelete failed: 0x%x\n", rc);
- }
- }
- }
- }
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_PROCESS_TUNNEL_DATA_REQ, VCD_FUNCTION_OUT);
- /* Buffer still needed, do not free it */
- //itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), data_req_p->buffer);
- }
- break;
-
- case GTPV1U_ENB_DATA_FORWARDING_REQ: {
- gtpv1u_enb_data_forwarding_req_t *data_req_p = NULL;
- NwGtpv1uUlpApiT stack_req;
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- gtpv1u_ue_data_t *gtpv1u_ue_data_p = NULL;
- teid_t enb_s1u_teid = 0;
- teid_t tenb_x2u_teid = 0;
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_PROCESS_TUNNEL_DATA_REQ, VCD_FUNCTION_IN);
- data_req_p = >PV1U_ENB_DATA_FORWARDING_REQ(received_message_p);
- //ipv4_send_data(ipv4_data_p->sd, data_ind_p->buffer, data_ind_p->length);
-#if defined(GTP_DUMP_SOCKET) && GTP_DUMP_SOCKET > 0
- gtpv1u_eNB_write_dump_socket(&data_req_p->buffer[data_req_p->offset],data_req_p->length);
-#endif
- memset(&stack_req, 0, sizeof(NwGtpv1uUlpApiT));
- hash_rc = hashtable_get(RC.gtpv1u_data_g->ue_mapping, (uint64_t)data_req_p->rnti, (void **)>pv1u_ue_data_p);
-
- if (hash_rc == HASH_TABLE_KEY_NOT_EXISTS) {
- LOG_E(GTPU, "nwGtpv1uProcessUlpReq failed: while getting ue rnti %x in hashtable ue_mapping\n", data_req_p->rnti);
- } else {
- if ((data_req_p->rab_id >= GTPV1U_BEARER_OFFSET) && (data_req_p->rab_id <= max_val_LTE_DRB_Identity)) {
- enb_s1u_teid = gtpv1u_ue_data_p->bearers[data_req_p->rab_id - GTPV1U_BEARER_OFFSET].teid_eNB;
- tenb_x2u_teid = gtpv1u_ue_data_p->bearers[data_req_p->rab_id - GTPV1U_BEARER_OFFSET].teid_teNB; // target enb teid
- stack_req.apiType = NW_GTPV1U_ULP_API_SEND_TPDU;
- stack_req.apiInfo.sendtoInfo.teid = tenb_x2u_teid;
- stack_req.apiInfo.sendtoInfo.ipAddr = gtpv1u_ue_data_p->bearers[data_req_p->rab_id - GTPV1U_BEARER_OFFSET].tenb_ip_addr;// target enb ip
- rc = nwGtpv1uGpduMsgNew(
- RC.gtpv1u_data_g->gtpv1u_stack,
- tenb_x2u_teid,
- NW_FALSE,
- RC.gtpv1u_data_g->seq_num++,
- data_req_p->buffer,
- data_req_p->length,
- data_req_p->offset,
- &(stack_req.apiInfo.sendtoInfo.hMsg));
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uGpduMsgNew failed: 0x%x\n", rc);
- MSC_LOG_EVENT(MSC_GTPU_ENB,"0 Failed send G-PDU ltid %u rtid %u size %u",
- enb_s1u_teid,tenb_x2u_teid,data_req_p->length);
- (void)enb_s1u_teid; /* avoid gcc warning "set but not used" */
- } else {
- rc = nwGtpv1uProcessUlpReq(RC.gtpv1u_data_g->gtpv1u_stack, &stack_req);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uProcessUlpReq failed: 0x%x\n", rc);
- MSC_LOG_EVENT(MSC_GTPU_ENB,"0 Failed send G-PDU ltid %u rtid %u size %u",
- enb_s1u_teid,tenb_x2u_teid,data_req_p->length);
- } else {
- MSC_LOG_TX_MESSAGE(
- MSC_GTPU_ENB,
- MSC_GTPU_SGW,
- NULL,
- 0,
- MSC_AS_TIME_FMT" G-PDU ltid %u rtid %u size %u",
- 0,0,
- enb_s1u_teid,
- tenb_x2u_teid,
- data_req_p->length);
- }
-
- rc = nwGtpv1uMsgDelete(RC.gtpv1u_data_g->gtpv1u_stack,
- stack_req.apiInfo.sendtoInfo.hMsg);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uMsgDelete failed: 0x%x\n", rc);
- }
- }
- }
- }
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_PROCESS_TUNNEL_DATA_REQ, VCD_FUNCTION_OUT);
- /* Buffer still needed, do not free it */
- //itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), data_req_p->buffer)
- }
- break;
-
- case GTPV1U_ENB_END_MARKER_REQ: {
- gtpv1u_enb_end_marker_req_t *data_req_p = NULL;
- NwGtpv1uUlpApiT stack_req;
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- gtpv1u_ue_data_t *gtpv1u_ue_data_p = NULL;
- teid_t enb_s1u_teid = 0;
- teid_t tenb_x2u_teid = 0;
- NwGtpv1uMsgT *pMsg = NULL;
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_PROCESS_TUNNEL_DATA_REQ, VCD_FUNCTION_IN);
- data_req_p = >PV1U_ENB_END_MARKER_REQ(received_message_p);
- //ipv4_send_data(ipv4_data_p->sd, data_ind_p->buffer, data_ind_p->length);
-#if defined(GTP_DUMP_SOCKET) && GTP_DUMP_SOCKET > 0
- gtpv1u_eNB_write_dump_socket(&data_req_p->buffer[data_req_p->offset],data_req_p->length);
-#endif
- memset(&stack_req, 0, sizeof(NwGtpv1uUlpApiT));
- hash_rc = hashtable_get(RC.gtpv1u_data_g->ue_mapping, (uint64_t)data_req_p->rnti, (void **)>pv1u_ue_data_p);
-
- if (hash_rc == HASH_TABLE_KEY_NOT_EXISTS) {
- LOG_E(GTPU, "nwGtpv1uProcessUlpReq failed: while getting ue rnti %x in hashtable ue_mapping\n", data_req_p->rnti);
- } else {
- if ((data_req_p->rab_id >= GTPV1U_BEARER_OFFSET) && (data_req_p->rab_id <= max_val_LTE_DRB_Identity)) {
- enb_s1u_teid = gtpv1u_ue_data_p->bearers[data_req_p->rab_id - GTPV1U_BEARER_OFFSET].teid_eNB;
- tenb_x2u_teid = gtpv1u_ue_data_p->bearers[data_req_p->rab_id - GTPV1U_BEARER_OFFSET].teid_teNB; // target enb teid
- stack_req.apiType = NW_GTPV1U_ULP_API_SEND_TPDU;
- stack_req.apiInfo.sendtoInfo.teid = tenb_x2u_teid;
- stack_req.apiInfo.sendtoInfo.ipAddr = gtpv1u_ue_data_p->bearers[data_req_p->rab_id - GTPV1U_BEARER_OFFSET].tenb_ip_addr;// target enb ip
- rc = nwGtpv1uGpduMsgNew(
- RC.gtpv1u_data_g->gtpv1u_stack,
- tenb_x2u_teid,
- NW_FALSE,
- RC.gtpv1u_data_g->seq_num++,
- data_req_p->buffer,
- data_req_p->length,
- data_req_p->offset,
- &(stack_req.apiInfo.sendtoInfo.hMsg));
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uGpduMsgNew failed: 0x%x\n", rc);
- MSC_LOG_EVENT(MSC_GTPU_ENB,"0 Failed send G-PDU ltid %u rtid %u size %u",
- enb_s1u_teid,tenb_x2u_teid,data_req_p->length);
- (void)enb_s1u_teid; /* avoid gcc warning "set but not used" */
- } else {
- pMsg = (NwGtpv1uMsgT *) stack_req.apiInfo.sendtoInfo.hMsg;
- pMsg->msgType = NW_GTP_END_MARKER;
- rc = nwGtpv1uProcessUlpReq(RC.gtpv1u_data_g->gtpv1u_stack, &stack_req);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uProcessUlpReq failed: 0x%x\n", rc);
- MSC_LOG_EVENT(MSC_GTPU_ENB,"0 Failed send G-PDU ltid %u rtid %u size %u",
- enb_s1u_teid,tenb_x2u_teid,data_req_p->length);
- } else {
- MSC_LOG_TX_MESSAGE(
- MSC_GTPU_ENB,
- MSC_GTPU_SGW,
- NULL,
- 0,
- MSC_AS_TIME_FMT" G-PDU ltid %u rtid %u size %u",
- 0,0,
- enb_s1u_teid,
- tenb_x2u_teid,
- data_req_p->length);
- }
-
- rc = nwGtpv1uMsgDelete(RC.gtpv1u_data_g->gtpv1u_stack,
- stack_req.apiInfo.sendtoInfo.hMsg);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uMsgDelete failed: 0x%x\n", rc);
- }
-
- gtpv1u_enb_delete_tunnel_req_t delete_tunnel_req;
- memset(&delete_tunnel_req, 0, sizeof(delete_tunnel_req));
- delete_tunnel_req.rnti = data_req_p->rnti;
- gtpv1u_delete_x2u_tunnel(instance, &delete_tunnel_req, GTPV1U_SOURCE_ENB);
- }
- }
- }
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_PROCESS_TUNNEL_DATA_REQ, VCD_FUNCTION_OUT);
- }
- break;
-
- case TERMINATE_MESSAGE: {
- if (RC.gtpv1u_data_g->ue_mapping != NULL) {
- hashtable_destroy (&(RC.gtpv1u_data_g->ue_mapping));
- }
-
- if (RC.gtpv1u_data_g->teid_mapping != NULL) {
- hashtable_destroy (&(RC.gtpv1u_data_g->teid_mapping));
- }
-
- LOG_W(GTPU, " *** Exiting GTPU thread\n");
- itti_exit_task();
- }
- break;
-
- case TIMER_HAS_EXPIRED:
- nwGtpv1uProcessTimeout(&received_message_p->ittiMsg.timer_has_expired.arg);
- break;
-
- default: {
- LOG_E(GTPU, "Unkwnon message ID %d:%s\n",
- ITTI_MSG_ID(received_message_p),
- ITTI_MSG_NAME(received_message_p));
- }
- break;
- }
-
- rc = itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), received_message_p);
- AssertFatal(rc == EXIT_SUCCESS, "Failed to free memory (%d)!\n", rc);
- received_message_p = NULL;
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_ENB_TASK, VCD_FUNCTION_OUT);
- return NULL;
-}
-
-//-----------------------------------------------------------------------------
-void *gtpv1u_eNB_task(void *args) {
- int rc = 0;
- rc = gtpv1u_eNB_init();
- AssertFatal(rc == 0, "gtpv1u_eNB_init Failed");
- itti_mark_task_ready(TASK_GTPV1_U);
- MSC_START_USE();
-
- while(1) {
- (void) gtpv1u_eNB_process_itti_msg (NULL);
- }
-
- return NULL;
-}
-
diff --git a/openair3/GTPV1-U/gtpv1u_eNB_task.h b/openair3/GTPV1-U/gtpv1u_eNB_task.h
deleted file mode 100644
index a6e26259415bee26adf21407707cc01d3d46baf2..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/gtpv1u_eNB_task.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file gtpv1u_eNB_task.h
-* \brief
-* \author Lionel Gauthier
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-*/
-
-#ifndef GTPV1U_ENB_TASK_H_
-#define GTPV1U_ENB_TASK_H_
-
-
-/*
-int
-gtpv1u_new_data_req(
- uint8_t enb_id,
- uint8_t ue_id,
- uint8_t rab_id,
- uint8_t *buffer,
- uint32_t buf_len,
- uint32_t buf_offset);*/
-
-int gtpv1u_eNB_init(void);
-void *gtpv1u_eNB_process_itti_msg(void*);
-void *gtpv1u_eNB_task(void *args);
-
-int
-gtpv1u_create_x2u_tunnel(
- const instance_t instanceP,
- const gtpv1u_enb_create_x2u_tunnel_req_t * const create_tunnel_req_pP,
- gtpv1u_enb_create_x2u_tunnel_resp_t * const create_tunnel_resp_pP);
-
-int
-gtpv1u_create_s1u_tunnel(
- const instance_t instanceP,
- const gtpv1u_enb_create_tunnel_req_t * const create_tunnel_req_pP,
- gtpv1u_enb_create_tunnel_resp_t * const create_tunnel_resp_pP);
-
-int
-gtpv1u_update_s1u_tunnel(
- const instance_t instanceP,
- const gtpv1u_enb_create_tunnel_req_t * const create_tunnel_req_pP,
- const rnti_t prior_rnti);
-
-int gtpv1u_delete_x2u_tunnel(
- const instance_t instanceP,
- const gtpv1u_enb_delete_tunnel_req_t * const req_pP,
- int enbflag);
-#endif /* GTPV1U_ENB_TASK_H_ */
diff --git a/openair3/GTPV1-U/gtpv1u_gNB.c b/openair3/GTPV1-U/gtpv1u_gNB.c
deleted file mode 100644
index ff7c8c06042ada5c623c3090ac655e52d616012e..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/gtpv1u_gNB.c
+++ /dev/null
@@ -1,1012 +0,0 @@
-/* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file gtpv1u_gNB.c
- * \brief
- * \author Sebastien ROUX, Lionel GAUTHIER, Navid Nikaein, Panos MATZAKOS
- * \version 1.0
- * \company Eurecom
- * \email: lionel.gauthier@eurecom.fr
- */
-#include <stdio.h>
-#include <errno.h>
-
-#include "mme_config.h"
-#include "intertask_interface.h"
-#include "msc.h"
-
-#include "gtpv1u.h"
-#include "NwGtpv1u.h"
-#include "NwGtpv1uMsg.h"
-#include "NwGtpv1uPrivate.h"
-#include "NwLog.h"
-#include "gtpv1u_eNB_defs.h"
-#include "gtpv1u_gNB_defs.h"
-#include "gtpv1_u_messages_types.h"
-#include "udp_eNB_task.h"
-#include "common/utils/LOG/log.h"
-#include "COMMON/platform_types.h"
-#include "COMMON/platform_constants.h"
-#include "common/utils/LOG/vcd_signal_dumper.h"
-#include "common/ran_context.h"
-#include "gtpv1u_eNB_task.h"
-#include "gtpv1u_gNB_task.h"
-#include "rrc_eNB_GTPV1U.h"
-
-#undef GTP_DUMP_SOCKET
-
-#undef GTPV1U_BEARER_OFFSET
-#define GTPV1U_BEARER_OFFSET 1
-
-extern unsigned char NB_eNB_INST;
-
-extern RAN_CONTEXT_t RC;
-
-extern NwGtpv1uRcT gtpv1u_eNB_send_udp_msg(
- NwGtpv1uUdpHandleT udpHandle,
- uint8_t *buffer,
- uint32_t buffer_len,
- uint32_t buffer_offset,
- uint32_t peerIpAddr,
- uint16_t peerPort);
-
-extern NwGtpv1uRcT gtpv1u_eNB_log_request(NwGtpv1uLogMgrHandleT hLogMgr,
- uint32_t logLevel,
- NwCharT *file,
- uint32_t line,
- NwCharT *logStr);
-
-static NwGtpv1uRcT gtpv1u_start_timer_wrapper(
- NwGtpv1uTimerMgrHandleT tmrMgrHandle,
- uint32_t timeoutSec,
- uint32_t timeoutUsec,
- uint32_t tmrType,
- void *timeoutArg,
- NwGtpv1uTimerHandleT *hTmr) {
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- long timer_id;
-
- if (tmrType == NW_GTPV1U_TMR_TYPE_ONE_SHOT) {
- timer_setup(timeoutSec,
- timeoutUsec,
- TASK_GTPV1_U,
- INSTANCE_DEFAULT,
- TIMER_ONE_SHOT,
- timeoutArg,
- &timer_id);
- } else {
- timer_setup(timeoutSec,
- timeoutUsec,
- TASK_GTPV1_U,
- INSTANCE_DEFAULT,
- TIMER_PERIODIC,
- timeoutArg,
- &timer_id);
- }
-
- return rc;
-}
-
-
-static NwGtpv1uRcT
-gtpv1u_stop_timer_wrapper(
- NwGtpv1uTimerMgrHandleT tmrMgrHandle,
- NwGtpv1uTimerHandleT hTmr) {
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- return rc;
-}
-
-/* Callback called when a gtpv1u message arrived on UDP interface */
-NwGtpv1uRcT gtpv1u_gNB_process_stack_req(
- NwGtpv1uUlpHandleT hUlp,
- NwGtpv1uUlpApiT *pUlpApi) {
- boolean_t result = FALSE;
- teid_t teid = 0;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- gtpv1u_teid_data_t *gtpv1u_teid_data_p = NULL;
- protocol_ctxt_t ctxt;
- NwGtpv1uRcT rc;
-
- switch(pUlpApi->apiType) {
- /* Here there are two type of messages handled:
- * - T-PDU
- * - END-MARKER
- */
- case NW_GTPV1U_ULP_API_RECV_TPDU: {
- uint8_t buffer[4096];
- uint32_t buffer_len;
- //uint16_t msgType = NW_GTP_GPDU;
- //NwGtpv1uMsgT *pMsg = NULL;
- /* Nw-gptv1u stack has processed a PDU. we can schedule it to PDCP
- * for transmission.
- */
- teid = pUlpApi->apiInfo.recvMsgInfo.teid;
- //pMsg = (NwGtpv1uMsgT *) pUlpApi->apiInfo.recvMsgInfo.hMsg;
- //msgType = pMsg->msgType;
-
- if (NW_GTPV1U_OK != nwGtpv1uMsgGetTpdu(pUlpApi->apiInfo.recvMsgInfo.hMsg,
- buffer, &buffer_len)) {
- LOG_E(GTPU, "Error while retrieving T-PDU");
- }
-
- itti_free(TASK_UDP, ((NwGtpv1uMsgT *)pUlpApi->apiInfo.recvMsgInfo.hMsg)->msgBuf);
-#if defined(GTP_DUMP_SOCKET) && GTP_DUMP_SOCKET > 0
- gtpv1u_eNB_write_dump_socket(buffer,buffer_len);
-#endif
- rc = nwGtpv1uMsgDelete(RC.gtpv1u_data_g->gtpv1u_stack,
- pUlpApi->apiInfo.recvMsgInfo.hMsg);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uMsgDelete failed: 0x%x\n", rc);
- }
-
- hash_rc = hashtable_get(RC.gtpv1u_data_g->teid_mapping, teid, (void **)>pv1u_teid_data_p);
-
- if (hash_rc == HASH_TABLE_OK) {
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- LOG_D(GTPU, "Received T-PDU from gtpv1u stack teid %u size %d -> enb module id %u ue module id %u rab id %u\n",
- teid,
- buffer_len,
- gtpv1u_teid_data_p->enb_id,
- gtpv1u_teid_data_p->ue_id,
- gtpv1u_teid_data_p->eps_bearer_id);
-#endif
- //warning "LG eps bearer mapping to DRB id to do (offset -4)"
- PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, gtpv1u_teid_data_p->enb_id, ENB_FLAG_YES, gtpv1u_teid_data_p->ue_id, 0, 0,gtpv1u_teid_data_p->enb_id);
- MSC_LOG_TX_MESSAGE(
- MSC_GTPU_ENB,
- MSC_PDCP_ENB,
- NULL,0,
- MSC_AS_TIME_FMT" DATA-REQ rb %u size %u",
- 0,0,
- (gtpv1u_teid_data_p->eps_bearer_id) ? gtpv1u_teid_data_p->eps_bearer_id - 4: 5-4,
- buffer_len);
-
- result = pdcp_data_req(
- &ctxt,
- SRB_FLAG_NO,
- (gtpv1u_teid_data_p->eps_bearer_id) ? gtpv1u_teid_data_p->eps_bearer_id - 4: 5-4,
- 0, // mui
- SDU_CONFIRM_NO, // confirm
- buffer_len,
- buffer,
- PDCP_TRANSMISSION_MODE_DATA,NULL, NULL
- );
-
- if ( result == FALSE ) {
- LOG_W(GTPU, "PDCP data request failed\n");
-
- return NW_GTPV1U_FAILURE;
- }
- } else {
- LOG_W(GTPU, "Received T-PDU from gtpv1u stack teid %u unknown size %u", teid, buffer_len);
- }
- }
- break;
-
- default: {
- LOG_E(GTPU, "Received undefined UlpApi (%02x) from gtpv1u stack!\n",
- pUlpApi->apiType);
- }
- } // end of switch
-
- return NW_GTPV1U_OK;
-}
-
-int gtpv1u_gNB_init(void) {
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uUlpEntityT ulp;
- NwGtpv1uUdpEntityT udp;
- NwGtpv1uLogMgrEntityT log;
- NwGtpv1uTimerMgrEntityT tmr;
- // enb_properties_p = enb_config_get()->properties[0];
- RC.gtpv1u_data_g = (gtpv1u_data_t *)calloc(sizeof(gtpv1u_data_t),1);
- LOG_I(GTPU, "Initializing GTPU stack %p\n",&RC.gtpv1u_data_g);
- //gtpv1u_data_g.gtpv1u_stack;
- /* Initialize UE hashtable */
- RC.gtpv1u_data_g->ue_mapping = hashtable_create (32, NULL, NULL);
- AssertFatal(RC.gtpv1u_data_g->ue_mapping != NULL, " ERROR Initializing TASK_GTPV1_U task interface: in hashtable_create returned %p\n", RC.gtpv1u_data_g->ue_mapping);
- RC.gtpv1u_data_g->teid_mapping = hashtable_create (256, NULL, NULL);
- AssertFatal(RC.gtpv1u_data_g->teid_mapping != NULL, " ERROR Initializing TASK_GTPV1_U task interface: in hashtable_create\n");
- // RC.gtpv1u_data_g.enb_ip_address_for_S1u_S12_S4_up = enb_properties_p->enb_ipv4_address_for_S1U;
- //gtpv1u_data_g.udp_data;
- RC.gtpv1u_data_g->seq_num = 0;
- RC.gtpv1u_data_g->restart_counter = 0;
-
- /* Initializing GTPv1-U stack */
- if ((rc = nwGtpv1uInitialize(&RC.gtpv1u_data_g->gtpv1u_stack, GTPU_STACK_ENB)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "Failed to setup nwGtpv1u stack %x\n", rc);
- return -1;
- }
-
- if ((rc = nwGtpv1uSetLogLevel(RC.gtpv1u_data_g->gtpv1u_stack,
- NW_LOG_LEVEL_DEBG)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "Failed to setup loglevel for stack %x\n", rc);
- return -1;
- }
-
- /* Set the ULP API callback. Called once message have been processed by the
- * nw-gtpv1u stack.
- */
- ulp.ulpReqCallback = gtpv1u_gNB_process_stack_req;
- memset((void *)&(ulp.hUlp), 0, sizeof(NwGtpv1uUlpHandleT));
-
- if ((rc = nwGtpv1uSetUlpEntity(RC.gtpv1u_data_g->gtpv1u_stack, &ulp)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uSetUlpEntity: %x", rc);
- return -1;
- }
-
- /* nw-gtpv1u stack requires an udp callback to send data over UDP.
- * We provide a wrapper to UDP task.
- */
- udp.udpDataReqCallback = gtpv1u_eNB_send_udp_msg;
- memset((void *)&(udp.hUdp), 0, sizeof(NwGtpv1uUdpHandleT));
-
- if ((rc = nwGtpv1uSetUdpEntity(RC.gtpv1u_data_g->gtpv1u_stack, &udp)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uSetUdpEntity: %x", rc);
- return -1;
- }
-
- log.logReqCallback = gtpv1u_eNB_log_request;
- memset((void *)&(log.logMgrHandle), 0, sizeof(NwGtpv1uLogMgrHandleT));
-
- if ((rc = nwGtpv1uSetLogMgrEntity(RC.gtpv1u_data_g->gtpv1u_stack, &log)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uSetLogMgrEntity: %x", rc);
- return -1;
- }
-
- /* Timer interface is more complicated as both wrappers doesn't send a message
- * to the timer task but call the timer API functions start/stop timer.
- */
- tmr.tmrMgrHandle = 0;
- tmr.tmrStartCallback = gtpv1u_start_timer_wrapper;
- tmr.tmrStopCallback = gtpv1u_stop_timer_wrapper;
-
- if ((rc = nwGtpv1uSetTimerMgrEntity(RC.gtpv1u_data_g->gtpv1u_stack, &tmr)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uSetTimerMgrEntity: %x", rc);
- return -1;
- }
-
-#if defined(GTP_DUMP_SOCKET) && GTP_DUMP_SOCKET > 0
-
- if ((ret = gtpv1u_eNB_create_dump_socket()) < 0) {
- return -1;
- }
-
-#endif
- LOG_D(GTPU, "Initializing GTPV1U interface for eNB: DONE\n");
- return 0;
-}
-
-void *gtpv1u_gNB_task(void *args) {
- int rc = 0;
- rc = gtpv1u_gNB_init();
- AssertFatal(rc == 0, "gtpv1u_eNB_init Failed");
- itti_mark_task_ready(TASK_GTPV1_U);
- MSC_START_USE();
-
- while(1) {
- (void) gtpv1u_eNB_process_itti_msg (NULL);
- }
-
- return NULL;
-}
-
-/* Callback called when a gtpv1u message arrived on UDP interface */
-NwGtpv1uRcT nr_gtpv1u_gNB_process_stack_req(
- NwGtpv1uUlpHandleT hUlp,
- NwGtpv1uUlpApiT *pUlpApi) {
- boolean_t result = FALSE;
- teid_t teid = 0;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- nr_gtpv1u_teid_data_t *gtpv1u_teid_data_p = NULL;
- protocol_ctxt_t ctxt;
- NwGtpv1uRcT rc;
-
- switch(pUlpApi->apiType) {
- /* Here there are two type of messages handled:
- * - T-PDU
- * - END-MARKER
- */
- case NW_GTPV1U_ULP_API_RECV_TPDU: {
- uint8_t buffer[4096];
- uint32_t buffer_len;
- //uint16_t msgType = NW_GTP_GPDU;
- //NwGtpv1uMsgT *pMsg = NULL;
- /* Nw-gptv1u stack has processed a PDU. we can schedule it to PDCP
- * for transmission.
- */
- teid = pUlpApi->apiInfo.recvMsgInfo.teid;
- //pMsg = (NwGtpv1uMsgT *) pUlpApi->apiInfo.recvMsgInfo.hMsg;
- //msgType = pMsg->msgType;
-
- if (NW_GTPV1U_OK != nwGtpv1uMsgGetTpdu(pUlpApi->apiInfo.recvMsgInfo.hMsg,
- buffer, &buffer_len)) {
- LOG_E(GTPU, "Error while retrieving T-PDU");
- }
-
- itti_free(TASK_UDP, ((NwGtpv1uMsgT *)pUlpApi->apiInfo.recvMsgInfo.hMsg)->msgBuf);
-#if defined(GTP_DUMP_SOCKET) && GTP_DUMP_SOCKET > 0
- gtpv1u_eNB_write_dump_socket(buffer,buffer_len);
-#endif
- rc = nwGtpv1uMsgDelete(RC.nr_gtpv1u_data_g->gtpv1u_stack,
- pUlpApi->apiInfo.recvMsgInfo.hMsg);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uMsgDelete failed: 0x%x\n", rc);
- }
-
- hash_rc = hashtable_get(RC.nr_gtpv1u_data_g->teid_mapping, teid, (void **)>pv1u_teid_data_p);
-
- if (hash_rc == HASH_TABLE_OK) {
-// #if defined(LOG_GTPU) && LOG_GTPU > 0
- LOG_D(GTPU, "Received T-PDU from gtpv1u stack teid %u size %d -> gnb module id %u ue module id %u pdu session id %u\n",
- teid,
- buffer_len,
- gtpv1u_teid_data_p->gnb_id,
- gtpv1u_teid_data_p->ue_id,
- gtpv1u_teid_data_p->pdu_session_id);
-// #endif
- //warning "LG eps bearer mapping to DRB id to do (offset -4)"
- PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, gtpv1u_teid_data_p->gnb_id, GNB_FLAG_YES, gtpv1u_teid_data_p->ue_id, 0, 0,gtpv1u_teid_data_p->gnb_id);
- // MSC_LOG_TX_MESSAGE(
- // MSC_GTPU_ENB,
- // MSC_PDCP_ENB,
- // NULL,0,
- // MSC_AS_TIME_FMT" DATA-REQ rb %u size %u",
- // 0,0,
- // (gtpv1u_teid_data_p->eps_bearer_id) ? gtpv1u_teid_data_p->eps_bearer_id - 4: 5-4,
- // buffer_len);
-
- result = pdcp_data_req(
- &ctxt,
- SRB_FLAG_NO,
- 1,
- 0, // mui
- SDU_CONFIRM_NO, // confirm
- buffer_len,
- buffer,
- PDCP_TRANSMISSION_MODE_DATA,NULL, NULL
- );
-
- if ( result == FALSE ) {
- LOG_W(GTPU, "PDCP data request failed\n");
-
- return NW_GTPV1U_FAILURE;
- }
- } else {
- LOG_W(GTPU, "Received T-PDU from gtpv1u stack teid %u unknown size %u", teid, buffer_len);
- }
- }
- break;
-
- default: {
- LOG_E(GTPU, "Received undefined UlpApi (%02x) from gtpv1u stack!\n",
- pUlpApi->apiType);
- }
- } // end of switch
-
- return NW_GTPV1U_OK;
-}
-
-int nr_gtpv1u_gNB_init(void) {
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uUlpEntityT ulp;
- NwGtpv1uUdpEntityT udp;
- NwGtpv1uLogMgrEntityT log;
- NwGtpv1uTimerMgrEntityT tmr;
- // enb_properties_p = enb_config_get()->properties[0];
- RC.nr_gtpv1u_data_g = (nr_gtpv1u_data_t *)calloc(sizeof(nr_gtpv1u_data_t),1);
- LOG_I(GTPU, "Initializing GTPU stack %p\n",&RC.nr_gtpv1u_data_g);
-
- /* Initialize UE hashtable */
- RC.nr_gtpv1u_data_g->ue_mapping = hashtable_create (32, NULL, NULL);
- AssertFatal(RC.nr_gtpv1u_data_g->ue_mapping != NULL, " ERROR Initializing TASK_GTPV1_U task interface: in hashtable_create returned %p\n", RC.gtpv1u_data_g->ue_mapping);
- RC.nr_gtpv1u_data_g->teid_mapping = hashtable_create (256, NULL, NULL);
- AssertFatal(RC.nr_gtpv1u_data_g->teid_mapping != NULL, " ERROR Initializing TASK_GTPV1_U task interface: in hashtable_create\n");
- // RC.gtpv1u_data_g.enb_ip_address_for_S1u_S12_S4_up = enb_properties_p->enb_ipv4_address_for_S1U;
- //gtpv1u_data_g.udp_data;
- RC.nr_gtpv1u_data_g->seq_num = 0;
- RC.nr_gtpv1u_data_g->restart_counter = 0;
-
- /* Initializing GTPv1-U stack */
- if ((rc = nwGtpv1uInitialize(&RC.nr_gtpv1u_data_g->gtpv1u_stack, GTPU_STACK_ENB)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "Failed to setup nwGtpv1u stack %x\n", rc);
- return -1;
- }
-
- if ((rc = nwGtpv1uSetLogLevel(RC.nr_gtpv1u_data_g->gtpv1u_stack,
- NW_LOG_LEVEL_DEBG)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "Failed to setup loglevel for stack %x\n", rc);
- return -1;
- }
-
- /* Set the ULP API callback. Called once message have been processed by the
- * nw-gtpv1u stack.
- */
- ulp.ulpReqCallback = nr_gtpv1u_gNB_process_stack_req;
- memset((void *)&(ulp.hUlp), 0, sizeof(NwGtpv1uUlpHandleT));
-
- if ((rc = nwGtpv1uSetUlpEntity(RC.nr_gtpv1u_data_g->gtpv1u_stack, &ulp)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uSetUlpEntity: %x", rc);
- return -1;
- }
-
- /* nw-gtpv1u stack requires an udp callback to send data over UDP.
- * We provide a wrapper to UDP task.
- */
- udp.udpDataReqCallback = gtpv1u_eNB_send_udp_msg;
- memset((void *)&(udp.hUdp), 0, sizeof(NwGtpv1uUdpHandleT));
-
- if ((rc = nwGtpv1uSetUdpEntity(RC.nr_gtpv1u_data_g->gtpv1u_stack, &udp)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uSetUdpEntity: %x", rc);
- return -1;
- }
-
- log.logReqCallback = gtpv1u_eNB_log_request;
- memset((void *)&(log.logMgrHandle), 0, sizeof(NwGtpv1uLogMgrHandleT));
-
- if ((rc = nwGtpv1uSetLogMgrEntity(RC.nr_gtpv1u_data_g->gtpv1u_stack, &log)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uSetLogMgrEntity: %x", rc);
- return -1;
- }
-
- /* Timer interface is more complicated as both wrappers doesn't send a message
- * to the timer task but call the timer API functions start/stop timer.
- */
- tmr.tmrMgrHandle = 0;
- tmr.tmrStartCallback = gtpv1u_start_timer_wrapper;
- tmr.tmrStopCallback = gtpv1u_stop_timer_wrapper;
-
- if ((rc = nwGtpv1uSetTimerMgrEntity(RC.nr_gtpv1u_data_g->gtpv1u_stack, &tmr)) != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uSetTimerMgrEntity: %x", rc);
- return -1;
- }
-
-#if defined(GTP_DUMP_SOCKET) && GTP_DUMP_SOCKET > 0
-
- if ((ret = gtpv1u_eNB_create_dump_socket()) < 0) {
- return -1;
- }
-
-#endif
- LOG_D(GTPU, "Initializing GTPV1U interface for eNB: DONE\n");
- return 0;
-}
-
-//-----------------------------------------------------------------------------
-int
-gtpv1u_create_ngu_tunnel(
- const instance_t instanceP,
- const gtpv1u_gnb_create_tunnel_req_t *const create_tunnel_req_pP,
- gtpv1u_gnb_create_tunnel_resp_t *const create_tunnel_resp_pP)
-{
- /* Create a new nw-gtpv1-u stack req using API */
- NwGtpv1uUlpApiT stack_req;
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- /* Local tunnel end-point identifier */
- teid_t ngu_teid = 0;
- nr_gtpv1u_teid_data_t *gtpv1u_teid_data_p = NULL;
- nr_gtpv1u_ue_data_t *gtpv1u_ue_data_p = NULL;
- //MessageDef *message_p = NULL;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- int i;
- pdusessionid_t pdusession_id = 0;
- // int ipv4_addr = 0;
- int ip_offset = 0;
- in_addr_t in_addr;
- int addrs_length_in_bytes= 0;
- int loop_counter = 0;
- int ret = 0;
- MSC_LOG_RX_MESSAGE(
- MSC_GTPU_GNB,
- MSC_RRC_GNB,
- NULL,0,
- MSC_AS_TIME_FMT" CREATE_TUNNEL_REQ RNTI %"PRIx16" inst %u ntuns %u psid %u upf-ngu teid %u",
- 0,0,create_tunnel_req_pP->rnti, instanceP,
- create_tunnel_req_pP->num_tunnels, create_tunnel_req_pP->pdusession_id[0],
- create_tunnel_req_pP->outgoing_teid[0]);
- create_tunnel_resp_pP->rnti = create_tunnel_req_pP->rnti;
- create_tunnel_resp_pP->status = 0;
- create_tunnel_resp_pP->num_tunnels = 0;
-
- for (i = 0; i < create_tunnel_req_pP->num_tunnels; i++) {
- ip_offset = 0;
- loop_counter = 0;
- pdusession_id = create_tunnel_req_pP->pdusession_id[i];
- LOG_D(GTPU, "Rx GTPV1U_GNB_CREATE_TUNNEL_REQ ue rnti %x pdu session id %u\n",
- create_tunnel_req_pP->rnti, pdusession_id);
- memset(&stack_req, 0, sizeof(NwGtpv1uUlpApiT));
- stack_req.apiType = NW_GTPV1U_ULP_API_CREATE_TUNNEL_ENDPOINT;
-
- do {
- ngu_teid = gtpv1u_new_teid();
- LOG_D(GTPU, "gtpv1u_create_ngu_tunnel() 0x%x %u(dec)\n", ngu_teid, ngu_teid);
- stack_req.apiInfo.createTunnelEndPointInfo.teid = ngu_teid;
- stack_req.apiInfo.createTunnelEndPointInfo.hUlpSession = 0;
- stack_req.apiInfo.createTunnelEndPointInfo.hStackSession = 0;
- rc = nwGtpv1uProcessUlpReq(RC.nr_gtpv1u_data_g->gtpv1u_stack, &stack_req);
- LOG_D(GTPU, ".\n");
- loop_counter++;
- } while (rc != NW_GTPV1U_OK && loop_counter < 10);
-
- if ( rc != NW_GTPV1U_OK && loop_counter == 10 ) {
- LOG_E(GTPU,"NwGtpv1uCreateTunnelEndPoint failed 10 times,start next loop\n");
- ret = -1;
- continue;
- }
-
- //-----------------------
- // PDCP->GTPV1U mapping
- //-----------------------
- hash_rc = hashtable_get(RC.nr_gtpv1u_data_g->ue_mapping, create_tunnel_req_pP->rnti, (void **)>pv1u_ue_data_p);
-
- if ((hash_rc == HASH_TABLE_KEY_NOT_EXISTS) || (hash_rc == HASH_TABLE_OK)) {
- if (hash_rc == HASH_TABLE_KEY_NOT_EXISTS) {
- gtpv1u_ue_data_p = calloc (1, sizeof(gtpv1u_ue_data_t));
- hash_rc = hashtable_insert(RC.nr_gtpv1u_data_g->ue_mapping, create_tunnel_req_pP->rnti, gtpv1u_ue_data_p);
- AssertFatal(hash_rc == HASH_TABLE_OK, "Error inserting ue_mapping in GTPV1U hashtable");
- }
-
- gtpv1u_ue_data_p->ue_id = create_tunnel_req_pP->rnti;
- gtpv1u_ue_data_p->instance_id = 0; // TO DO
- memcpy(&create_tunnel_resp_pP->gnb_addr.buffer,
- &RC.nr_gtpv1u_data_g->gnb_ip_address_for_NGu_up,
- sizeof (in_addr_t));
-
- LOG_I(GTPU,"Configured GTPu address : %x\n",RC.nr_gtpv1u_data_g->gnb_ip_address_for_NGu_up);
- create_tunnel_resp_pP->gnb_addr.length = sizeof (in_addr_t);
- addrs_length_in_bytes = create_tunnel_req_pP->dst_addr[i].length / 8;
- AssertFatal((addrs_length_in_bytes == 4) ||
- (addrs_length_in_bytes == 16) ||
- (addrs_length_in_bytes == 20),
- "Bad transport layer address length %d (bits) %d (bytes)",
- create_tunnel_req_pP->dst_addr[i].length, addrs_length_in_bytes);
-
- if ((addrs_length_in_bytes == 4) ||
- (addrs_length_in_bytes == 20)) {
- in_addr = *((in_addr_t *)create_tunnel_req_pP->dst_addr[i].buffer);
- ip_offset = 4;
- gtpv1u_ue_data_p->bearers[pdusession_id - GTPV1U_BEARER_OFFSET].upf_ip_addr = in_addr;
- }
-
- if ((addrs_length_in_bytes == 16) ||
- (addrs_length_in_bytes == 20)) {
- memcpy(gtpv1u_ue_data_p->bearers[pdusession_id - GTPV1U_BEARER_OFFSET].upf_ip6_addr.s6_addr,
- &create_tunnel_req_pP->dst_addr[i].buffer[ip_offset],
- 16);
- }
-
- gtpv1u_ue_data_p->bearers[pdusession_id - GTPV1U_BEARER_OFFSET].state = BEARER_IN_CONFIG;
- gtpv1u_ue_data_p->bearers[pdusession_id - GTPV1U_BEARER_OFFSET].teid_gNB = ngu_teid;
- gtpv1u_ue_data_p->bearers[pdusession_id - GTPV1U_BEARER_OFFSET].teid_gNB_stack_session = stack_req.apiInfo.createTunnelEndPointInfo.hStackSession;
- gtpv1u_ue_data_p->bearers[pdusession_id - GTPV1U_BEARER_OFFSET].teid_upf = create_tunnel_req_pP->outgoing_teid[i];
- gtpv1u_ue_data_p->num_bearers++;
- create_tunnel_resp_pP->gnb_NGu_teid[i] = ngu_teid;
-
- LOG_I(GTPU,"Copied to create_tunnel_resp tunnel: index %d target gNB ip %d.%d.%d.%d length %d gtp teid %u\n",
- i,
- create_tunnel_resp_pP->gnb_addr.buffer[0],
- create_tunnel_resp_pP->gnb_addr.buffer[1],
- create_tunnel_resp_pP->gnb_addr.buffer[2],
- create_tunnel_resp_pP->gnb_addr.buffer[3],
- create_tunnel_resp_pP->gnb_addr.length,
- create_tunnel_resp_pP->gnb_NGu_teid[i]);
- } else {
- create_tunnel_resp_pP->gnb_NGu_teid[i] = 0;
- create_tunnel_resp_pP->status = 0xFF;
- }
-
- create_tunnel_resp_pP->pdusession_id[i] = pdusession_id;
- create_tunnel_resp_pP->num_tunnels += 1;
- //-----------------------
- // GTPV1U->PDCP mapping
- //-----------------------
- hash_rc = hashtable_get(RC.nr_gtpv1u_data_g->teid_mapping, ngu_teid, (void **)>pv1u_teid_data_p);
-
- if (hash_rc == HASH_TABLE_KEY_NOT_EXISTS) {
- gtpv1u_teid_data_p = calloc (1, sizeof(nr_gtpv1u_teid_data_t));
- gtpv1u_teid_data_p->gnb_id = 0; // TO DO
- gtpv1u_teid_data_p->ue_id = create_tunnel_req_pP->rnti;
- gtpv1u_teid_data_p->pdu_session_id = pdusession_id;
- hash_rc = hashtable_insert(RC.nr_gtpv1u_data_g->teid_mapping, ngu_teid, gtpv1u_teid_data_p);
- AssertFatal(hash_rc == HASH_TABLE_OK, "Error inserting teid mapping in GTPV1U hashtable");
- } else {
- create_tunnel_resp_pP->gnb_NGu_teid[i] = 0;
- create_tunnel_resp_pP->status = 0xFF;
- }
- }
-
- MSC_LOG_TX_MESSAGE(
- MSC_GTPU_GNB,
- MSC_RRC_GNB,
- NULL,0,
- "0 GTPV1U_GNB_CREATE_TUNNEL_RESP rnti %x teid %x",
- create_tunnel_resp_pP->rnti,
- ngu_teid);
- LOG_D(GTPU, "Tx GTPV1U_GNB_CREATE_TUNNEL_RESP ue rnti %x status %d\n",
- create_tunnel_req_pP->rnti,
- create_tunnel_resp_pP->status);
- //return 0;
- return ret;
-}
-
-int gtpv1u_update_ngu_tunnel(
- const instance_t instanceP,
- const gtpv1u_gnb_create_tunnel_req_t *const create_tunnel_req_pP,
- const rnti_t prior_rnti
-) {
- /* Local tunnel end-point identifier */
- teid_t ngu_teid = 0;
- nr_gtpv1u_teid_data_t *gtpv1u_teid_data_p = NULL;
- nr_gtpv1u_ue_data_t *gtpv1u_ue_data_p = NULL;
- nr_gtpv1u_ue_data_t *gtpv1u_ue_data_new_p = NULL;
- //MessageDef *message_p = NULL;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- int i,j;
- uint8_t bearers_num = 0,bearers_total = 0;
- //-----------------------
- // PDCP->GTPV1U mapping
- //-----------------------
- hash_rc = hashtable_get(RC.nr_gtpv1u_data_g->ue_mapping, prior_rnti, (void **)>pv1u_ue_data_p);
-
- if(hash_rc != HASH_TABLE_OK) {
- LOG_E(GTPU,"Error get ue_mapping(rnti=%x) from GTPV1U hashtable error\n", prior_rnti);
- return -1;
- }
-
- gtpv1u_ue_data_new_p = calloc (1, sizeof(nr_gtpv1u_ue_data_t));
- memcpy(gtpv1u_ue_data_new_p,gtpv1u_ue_data_p,sizeof(nr_gtpv1u_ue_data_t));
- gtpv1u_ue_data_new_p->ue_id = create_tunnel_req_pP->rnti;
- hash_rc = hashtable_insert(RC.nr_gtpv1u_data_g->ue_mapping, create_tunnel_req_pP->rnti, gtpv1u_ue_data_new_p);
-
- //AssertFatal(hash_rc == HASH_TABLE_OK, "Error inserting ue_mapping in GTPV1U hashtable");
- if ( hash_rc != HASH_TABLE_OK ) {
- LOG_E(GTPU,"Failed to insert ue_mapping(rnti=%x) in GTPV1U hashtable\n",create_tunnel_req_pP->rnti);
- return -1;
- } else {
- LOG_I(GTPU, "inserting ue_mapping(rnti=%x) in GTPV1U hashtable\n",
- create_tunnel_req_pP->rnti);
- }
-
- hash_rc = hashtable_remove(RC.nr_gtpv1u_data_g->ue_mapping, prior_rnti);
- LOG_I(GTPU, "hashtable_remove ue_mapping(rnti=%x) in GTPV1U hashtable\n",
- prior_rnti);
- //-----------------------
- // GTPV1U->PDCP mapping
- //-----------------------
- bearers_total =gtpv1u_ue_data_new_p->num_bearers;
-
- for(j = 0; j<GTPV1U_MAX_BEARERS_ID; j++) {
- if(gtpv1u_ue_data_new_p->bearers[j].state != BEARER_IN_CONFIG)
- continue;
-
- bearers_num++;
-
- for (i = 0; i < create_tunnel_req_pP->num_tunnels; i++) {
- if(j == (create_tunnel_req_pP->pdusession_id[i]-GTPV1U_BEARER_OFFSET))
- break;
- }
-
- if(i < create_tunnel_req_pP->num_tunnels) {
- ngu_teid = gtpv1u_ue_data_new_p->bearers[j].teid_gNB;
- hash_rc = hashtable_get(RC.nr_gtpv1u_data_g->teid_mapping, ngu_teid, (void **)>pv1u_teid_data_p);
-
- if (hash_rc == HASH_TABLE_OK) {
- gtpv1u_teid_data_p->ue_id = create_tunnel_req_pP->rnti;
- gtpv1u_teid_data_p->pdu_session_id = create_tunnel_req_pP->pdusession_id[i];
- LOG_I(GTPU, "updata teid_mapping te_id %u (prior_rnti %x rnti %x) in GTPV1U hashtable\n",
- ngu_teid,prior_rnti,create_tunnel_req_pP->rnti);
- } else {
- LOG_W(GTPU, "Error get teid mapping(s1u_teid=%u) from GTPV1U hashtable", ngu_teid);
- }
- } else {
- ngu_teid = gtpv1u_ue_data_new_p->bearers[j].teid_gNB;
- hash_rc = hashtable_remove(RC.nr_gtpv1u_data_g->teid_mapping, ngu_teid);
-
- if (hash_rc != HASH_TABLE_OK) {
- LOG_D(GTPU, "Removed user rnti %x , enb S1U teid %u not found\n", prior_rnti, ngu_teid);
- }
-
- gtpv1u_ue_data_new_p->bearers[j].state = BEARER_DOWN;
- gtpv1u_ue_data_new_p->num_bearers--;
- LOG_I(GTPU, "delete teid_mapping te_id %u (rnti%x) bearer_id %d in GTPV1U hashtable\n",
- ngu_teid,prior_rnti,j+GTPV1U_BEARER_OFFSET);;
- }
-
- if(bearers_num > bearers_total)
- break;
- }
-
- return 0;
-}
-
-//-----------------------------------------------------------------------------
-int gtpv1u_delete_ngu_tunnel(
- const instance_t instanceP,
- const gtpv1u_gnb_delete_tunnel_req_t *const req_pP) {
- NwGtpv1uUlpApiT stack_req;
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- MessageDef *message_p = NULL;
- nr_gtpv1u_ue_data_t *gtpv1u_ue_data_p = NULL;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- teid_t teid_gNB = 0;
- int pdusession_index = 0;
- message_p = itti_alloc_new_message(TASK_GTPV1_U, 0, GTPV1U_GNB_DELETE_TUNNEL_RESP);
- GTPV1U_GNB_DELETE_TUNNEL_RESP(message_p).rnti = req_pP->rnti;
- GTPV1U_GNB_DELETE_TUNNEL_RESP(message_p).status = 0;
- hash_rc = hashtable_get(RC.nr_gtpv1u_data_g->ue_mapping, req_pP->rnti, (void **)>pv1u_ue_data_p);
-
- if (hash_rc == HASH_TABLE_OK) {
- for (pdusession_index = 0; pdusession_index < req_pP->num_pdusession; pdusession_index++) {
- teid_gNB = gtpv1u_ue_data_p->bearers[req_pP->pdusession_id[pdusession_index] - GTPV1U_BEARER_OFFSET].teid_gNB;
- LOG_D(GTPU, "Rx GTPV1U_ENB_DELETE_TUNNEL user rnti %x eNB S1U teid %u eps bearer id %u\n",
- req_pP->rnti, teid_gNB, req_pP->pdusession_id[pdusession_index]);
- {
- memset(&stack_req, 0, sizeof(NwGtpv1uUlpApiT));
- stack_req.apiType = NW_GTPV1U_ULP_API_DESTROY_TUNNEL_ENDPOINT;
- LOG_D(GTPU, "gtpv1u_delete_ngu_tunnel pdusession %u %u\n",
- req_pP->pdusession_id[pdusession_index],
- teid_gNB);
- stack_req.apiInfo.destroyTunnelEndPointInfo.hStackSessionHandle =
- gtpv1u_ue_data_p->bearers[req_pP->pdusession_id[pdusession_index] - GTPV1U_BEARER_OFFSET].teid_gNB_stack_session;
- rc = nwGtpv1uProcessUlpReq(RC.nr_gtpv1u_data_g->gtpv1u_stack, &stack_req);
- LOG_D(GTPU, ".\n");
- }
-
- if (rc != NW_GTPV1U_OK) {
- GTPV1U_GNB_DELETE_TUNNEL_RESP(message_p).status |= 0xFF;
- LOG_E(GTPU, "NW_GTPV1U_ULP_API_DESTROY_TUNNEL_ENDPOINT failed");
- }
-
- //-----------------------
- // PDCP->GTPV1U mapping
- //-----------------------
- gtpv1u_ue_data_p->bearers[req_pP->pdusession_id[pdusession_index] - GTPV1U_BEARER_OFFSET].state = BEARER_DOWN;
- gtpv1u_ue_data_p->bearers[req_pP->pdusession_id[pdusession_index] - GTPV1U_BEARER_OFFSET].teid_gNB = 0;
- gtpv1u_ue_data_p->bearers[req_pP->pdusession_id[pdusession_index] - GTPV1U_BEARER_OFFSET].teid_upf = 0;
- gtpv1u_ue_data_p->bearers[req_pP->pdusession_id[pdusession_index] - GTPV1U_BEARER_OFFSET].upf_ip_addr = 0;
- gtpv1u_ue_data_p->num_bearers -= 1;
-
- if (gtpv1u_ue_data_p->num_bearers == 0) {
- hash_rc = hashtable_remove(RC.nr_gtpv1u_data_g->ue_mapping, req_pP->rnti);
- LOG_D(GTPU, "Removed user rnti %x,no more bearers configured\n", req_pP->rnti);
- }
-
- //-----------------------
- // GTPV1U->PDCP mapping
- //-----------------------
- hash_rc = hashtable_remove(RC.nr_gtpv1u_data_g->teid_mapping, teid_gNB);
-
- if (hash_rc != HASH_TABLE_OK) {
- LOG_D(GTPU, "Removed user rnti %x , gNB NGU teid %u not found\n", req_pP->rnti, teid_gNB);
- }
- }
- }// else silently do nothing
-
- LOG_D(GTPU, "Tx GTPV1U_GNB_DELETE_TUNNEL_RESP user rnti %x gNB NGU teid %u status %u\n",
- GTPV1U_GNB_DELETE_TUNNEL_RESP(message_p).rnti,
- GTPV1U_GNB_DELETE_TUNNEL_RESP(message_p).gnb_NGu_teid,
- GTPV1U_GNB_DELETE_TUNNEL_RESP(message_p).status);
- MSC_LOG_TX_MESSAGE(
- MSC_GTPU_GNB,
- MSC_RRC_GNB,
- NULL,0,
- "0 GTPV1U_GNB_DELETE_TUNNEL_RESP rnti %x teid %x",
- GTPV1U_GNB_DELETE_TUNNEL_RESP(message_p).rnti,
- teid_gNB);
- return itti_send_msg_to_task(TASK_RRC_GNB, instanceP, message_p);
-}
-
-//-----------------------------------------------------------------------------
-static int gtpv1u_gNB_send_init_udp(const Gtpv1uNGReq *req) {
- // Create and alloc new message
- MessageDef *message_p;
- struct in_addr addr= {0};
- message_p = itti_alloc_new_message(TASK_GTPV1_U, 0, UDP_INIT);
-
- if (message_p == NULL) {
- return -1;
- }
-
- UDP_INIT(message_p).port = req->gnb_port_for_NGu_up;
- addr.s_addr = req->gnb_ip_address_for_NGu_up;
- UDP_INIT(message_p).address = inet_ntoa(addr);
- LOG_I(GTPU, "Tx UDP_INIT IP addr %s (%x)\n", UDP_INIT(message_p).address,UDP_INIT(message_p).port);
- MSC_LOG_EVENT(
- MSC_GTPU_ENB,
- "0 UDP bind %s:%u",
- UDP_INIT(message_p).address,
- UDP_INIT(message_p).port);
- return itti_send_msg_to_task(TASK_UDP, INSTANCE_DEFAULT, message_p);
-}
-
-static int gtpv1u_ng_req(
- const instance_t instanceP,
- const Gtpv1uNGReq *const req) {
- memcpy(&RC.nr_gtpv1u_data_g->gnb_ip_address_for_NGu_up,
- &req->gnb_ip_address_for_NGu_up,
- sizeof (req->gnb_ip_address_for_NGu_up));
- gtpv1u_gNB_send_init_udp(req);
- return 0;
-}
-
-static int gtpv1u_gnb_tunnel_data_req(gtpv1u_gnb_tunnel_data_req_t *gnb_tunnel_data_req) {
- gtpv1u_gnb_tunnel_data_req_t *data_req_p = NULL;
- NwGtpv1uUlpApiT stack_req;
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
- nr_gtpv1u_ue_data_t *gtpv1u_ue_data_p = NULL;
- teid_t gnb_ngu_teid = 0;
- teid_t outgoing_teid = 0;
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_PROCESS_TUNNEL_DATA_REQ, VCD_FUNCTION_IN);
- data_req_p = gnb_tunnel_data_req;
-
- memset(&stack_req, 0, sizeof(NwGtpv1uUlpApiT));
- hash_rc = hashtable_get(RC.nr_gtpv1u_data_g->ue_mapping, (uint64_t)data_req_p->rnti, (void **)>pv1u_ue_data_p);
-
- if (hash_rc == HASH_TABLE_KEY_NOT_EXISTS) {
- LOG_E(GTPU, "nwGtpv1uProcessUlpReq failed: while getting ue rnti %x in hashtable ue_mapping\n", data_req_p->rnti);
- } else {
- if ((data_req_p->pdusession_id >= GTPV1U_BEARER_OFFSET) && (data_req_p->pdusession_id < max_val_NR_DRB_Identity)) {
- gnb_ngu_teid = gtpv1u_ue_data_p->bearers[data_req_p->pdusession_id - GTPV1U_BEARER_OFFSET].teid_gNB;
- outgoing_teid = gtpv1u_ue_data_p->bearers[data_req_p->pdusession_id - GTPV1U_BEARER_OFFSET].teid_upf;
- stack_req.apiType = NW_GTPV1U_ULP_API_SEND_TPDU;
- stack_req.apiInfo.sendtoInfo.teid = outgoing_teid;
- stack_req.apiInfo.sendtoInfo.ipAddr = gtpv1u_ue_data_p->bearers[data_req_p->pdusession_id - GTPV1U_BEARER_OFFSET].upf_ip_addr;
- rc = nwGtpv1uGpduMsgNew(
- RC.nr_gtpv1u_data_g->gtpv1u_stack,
- outgoing_teid,
- NW_FALSE,
- RC.nr_gtpv1u_data_g->seq_num++,
- data_req_p->buffer,
- data_req_p->length,
- data_req_p->offset,
- &(stack_req.apiInfo.sendtoInfo.hMsg));
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uGpduMsgNew failed: 0x%x\n", rc);
- MSC_LOG_EVENT(MSC_GTPU_GNB,"0 Failed send G-PDU ltid %u rtid %u size %u",
- gnb_ngu_teid,outgoing_teid,data_req_p->length);
- (void)gnb_ngu_teid; /* avoid gcc warning "set but not used" */
- } else {
- rc = nwGtpv1uProcessUlpReq(RC.nr_gtpv1u_data_g->gtpv1u_stack, &stack_req);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uProcessUlpReq failed: 0x%x\n", rc);
- MSC_LOG_EVENT(MSC_GTPU_GNB,"0 Failed send G-PDU ltid %u rtid %u size %u",
- gnb_ngu_teid,outgoing_teid,data_req_p->length);
- } else {
- MSC_LOG_TX_MESSAGE(
- MSC_GTPU_GNB,
- MSC_GTPU_SGW,
- NULL,
- 0,
- MSC_AS_TIME_FMT" G-PDU ltid %u rtid %u size %u",
- 0,0,
- gnb_ngu_teid,
- outgoing_teid,
- data_req_p->length);
- }
-
- rc = nwGtpv1uMsgDelete(RC.nr_gtpv1u_data_g->gtpv1u_stack,
- stack_req.apiInfo.sendtoInfo.hMsg);
-
- if (rc != NW_GTPV1U_OK) {
- LOG_E(GTPU, "nwGtpv1uMsgDelete failed: 0x%x\n", rc);
- }
- }
- }
- }
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_PROCESS_TUNNEL_DATA_REQ, VCD_FUNCTION_OUT);
- /* Buffer still needed, do not free it */
- //itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), data_req_p->buffer);
-
- return 0;
-}
-
-//-----------------------------------------------------------------------------
-void *gtpv1u_gNB_process_itti_msg(void *notUsed) {
- /* Trying to fetch a message from the message queue.
- * If the queue is empty, this function will block till a
- * message is sent to the task.
- */
- instance_t instance;
- MessageDef *received_message_p = NULL;
- int rc = 0;
- itti_receive_msg(TASK_GTPV1_U, &received_message_p);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_ENB_TASK, VCD_FUNCTION_IN);
- DevAssert(received_message_p != NULL);
- instance = received_message_p->ittiMsgHeader.originInstance;
-
- switch (ITTI_MSG_ID(received_message_p)) {
- case GTPV1U_GNB_NG_REQ:
- gtpv1u_ng_req(instance, &received_message_p->ittiMsg.gtpv1uNGReq);
- break;
-
- case GTPV1U_GNB_DELETE_TUNNEL_REQ:
- gtpv1u_delete_ngu_tunnel(instance, &received_message_p->ittiMsg.NRGtpv1uDeleteTunnelReq);
- break;
-
- // DATA COMING FROM UDP
- case UDP_DATA_IND: {
- udp_data_ind_t *udp_data_ind_p;
- udp_data_ind_p = &received_message_p->ittiMsg.udp_data_ind;
- nwGtpv1uProcessUdpReq(RC.nr_gtpv1u_data_g->gtpv1u_stack,
- udp_data_ind_p->buffer,
- udp_data_ind_p->buffer_length,
- udp_data_ind_p->peer_port,
- udp_data_ind_p->peer_address);
- }
- break;
-
- // DATA TO BE SENT TO UDP
- case GTPV1U_GNB_TUNNEL_DATA_REQ:
- LOG_I(GTPU, "Received message %s\n", ITTI_MSG_NAME(received_message_p));
- gtpv1u_gnb_tunnel_data_req(>PV1U_GNB_TUNNEL_DATA_REQ(received_message_p));
- break;
-
- case TERMINATE_MESSAGE: {
- if (RC.nr_gtpv1u_data_g->ue_mapping != NULL) {
- hashtable_destroy (&(RC.nr_gtpv1u_data_g->ue_mapping));
- }
-
- if (RC.nr_gtpv1u_data_g->teid_mapping != NULL) {
- hashtable_destroy (&(RC.nr_gtpv1u_data_g->teid_mapping));
- }
-
- LOG_W(GTPU, " *** Exiting GTPU thread\n");
- itti_exit_task();
- }
- break;
-
- case TIMER_HAS_EXPIRED:
- nwGtpv1uProcessTimeout(&received_message_p->ittiMsg.timer_has_expired.arg);
- break;
-
- default: {
- LOG_E(GTPU, "Unkwnon message ID %d:%s\n",
- ITTI_MSG_ID(received_message_p),
- ITTI_MSG_NAME(received_message_p));
- }
- break;
- }
-
- rc = itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), received_message_p);
- AssertFatal(rc == EXIT_SUCCESS, "Failed to free memory (%d)!\n", rc);
- received_message_p = NULL;
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_ENB_TASK, VCD_FUNCTION_OUT);
- return NULL;
-}
-
-void *nr_gtpv1u_gNB_task(void *args) {
- int rc = 0;
- rc = nr_gtpv1u_gNB_init();
- AssertFatal(rc == 0, "gtpv1u_gNB_init Failed");
- itti_mark_task_ready(TASK_GTPV1_U);
- MSC_START_USE();
-
- while(1) {
- (void) gtpv1u_gNB_process_itti_msg (NULL);
- }
-
- return NULL;
-}
diff --git a/openair3/GTPV1-U/gtpv1u_gNB_defs.h b/openair3/GTPV1-U/gtpv1u_gNB_defs.h
deleted file mode 100644
index d4356aa3cf66ff5e2a24192c20c5fcc4256a21c8..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/gtpv1u_gNB_defs.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file gtpv1u_gNB_defs.h
- * \brief
- * \author Yoshio INOUE, Masayuki HARADA
- * \date 2020
- * \version 0.1
- * \email: yoshio.inoue@fujitsu.com,masayuki.harada@fujitsu.com
- * (yoshio.inoue%40fujitsu.com%2cmasayuki.harada%40fujitsu.com)
- */
-
-#include "hashtable.h"
-#include "NR_asn_constant.h"
-
-#ifndef GTPV1U_GNB_DEFS_H_
-#define GTPV1U_GNB_DEFS_H_
-
-#include "NwGtpv1u.h"
-
-#define GTPV1U_UDP_PORT (2152)
-
-#define NR_GTPV1U_MAX_BEARERS_ID (max_val_NR_DRB_Identity - 3)
-
-#define GTPV1U_SOURCE_GNB (0)
-#define GTPV1U_TARGET_GNB (1)
-#define GTPV1U_MSG_FROM_SOURCE_GNB (0)
-#define GTPV1U_MSG_FROM_UPF (1)
-
-
-typedef struct nr_gtpv1u_teid_data_s {
- /* UE identifier for oaisim stack */
- module_id_t gnb_id;
- rnti_t ue_id;
- pdusessionid_t pdu_session_id;
-} nr_gtpv1u_teid_data_t;
-
-
-typedef struct nr_gtpv1u_bearer_s {
- /* TEID used in dl and ul */
- teid_t teid_gNB; ///< gNB TEID
- uintptr_t teid_gNB_stack_session; ///< gNB TEID
- teid_t teid_upf; ///< Remote TEID
- in_addr_t upf_ip_addr;
- struct in6_addr upf_ip6_addr;
- teid_t teid_tgNB;
- in_addr_t tgnb_ip_addr; ///< target gNB ipv4
- struct in6_addr tgnb_ip6_addr; ///< target gNB ipv6
- tcp_udp_port_t port;
- //NwGtpv1uStackSessionHandleT stack_session;
- bearer_state_t state;
-} nr_gtpv1u_bearer_t;
-
-typedef struct nr_gtpv1u_ue_data_s {
- /* UE identifier for oaisim stack */
- rnti_t ue_id;
-
- /* Unique identifier used between PDCP and GTP-U to distinguish UEs */
- uint32_t instance_id;
- int num_bearers;
- /* Bearer related data.
- * Note that the first LCID available for data is 3 and we fixed the maximum
- * number of e-rab per UE to be (32 [id range]), max RB is 11. The real rb id will 3 + rab_id (3..32).
- */
- nr_gtpv1u_bearer_t bearers[NR_GTPV1U_MAX_BEARERS_ID];
-
- //RB_ENTRY(gtpv1u_ue_data_s) gtpv1u_ue_node;
-} nr_gtpv1u_ue_data_t;
-
-typedef struct nr_gtpv1u_data_s {
- /* nwgtpv1u stack internal data */
- NwGtpv1uStackHandleT gtpv1u_stack;
-
- /* RB tree of UEs */
- hash_table_t *ue_mapping; // PDCP->GTPV1U
- hash_table_t *teid_mapping; // GTPV1U -> PDCP
-
- //RB_HEAD(gtpv1u_ue_map, gtpv1u_ue_data_s) gtpv1u_ue_map_head;
- /* Local IP address to use */
- in_addr_t gnb_ip_address_for_NGu_up;
- /* UDP internal data */
- //udp_data_t udp_data;
-
- uint16_t seq_num;
- uint8_t restart_counter;
-
-} nr_gtpv1u_data_t;
-
-
-#endif /* GTPV1U_GNB_DEFS_H_ */
diff --git a/openair3/GTPV1-U/gtpv1u_sgw_defs.h b/openair3/GTPV1-U/gtpv1u_sgw_defs.h
deleted file mode 100644
index 1d62c18bf62b1c2cdd140f1aac73cf0d7e30dec2..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/gtpv1u_sgw_defs.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-#ifndef GTPV1U_SGW_DEFS_H_
-#define GTPV1U_SGW_DEFS_H_
-
-#include "mme_config.h"
-#include "NwGtpv1u.h"
-#include "gtpv1u.h"
-#include "hashtable.h"
-#include "common_types.h"
-
-#define GTPV1U_UDP_PORT (2152)
-
-#define MAX_BEARERS_PER_UE (11)
-
-typedef enum {
- BEARER_DOWN = 0,
- BEARER_IN_CONFIG,
- BEARER_UP,
- BEARER_DL_HANDOVER,
- BEARER_UL_HANDOVER,
- BEARER_MAX,
-} bearer_state_t;
-
-#define BUFFER_TO_uint32_t(buf, x) \
-do { \
- x = ((uint32_t)((buf)[0]) ) | \
- ((uint32_t)((buf)[1]) << 8) | \
- ((uint32_t)((buf)[2]) << 16) | \
- ((uint32_t)((buf)[3]) << 24); \
-} while(0)
-
-
-
-typedef struct gtpv1u_teid2enb_info_s {
- /* TEID used in dl and ul */
- uint32_t teid_enb; ///< Remote eNB TEID
- ip_address_t enb_ip_addr;
- bearer_state_t state;
- uint16_t port; /// LG ???
-} gtpv1u_teid2enb_info_t;
-
-/*struct gtpv1u_ue_data_s {
- // UE identifier for oaisim stack
- uint8_t ue_id;
-
- // Unique identifier used between PDCP and GTP-U to distinguish UEs
- uint32_t instance_id;
-
- // Bearer related data.
- // Note that the first LCID available for data is 3 and we fixed the maximum
- // number of e-rab per UE to be 11. The real rb id will 3 + rab_id (0..10).
- //
- struct gtpv1u_bearer_s bearers[MAX_BEARERS_PER_UE];
-
- RB_ENTRY(gtpv1u_ue_data_s) gtpv1u_ue_node;
-};*/
-
-typedef struct {
- /* nwgtpv1u stack internal data */
- NwGtpv1uStackHandleT gtpv1u_stack;
- /* RB tree of UEs */
- //RB_HEAD(gtpv1u_ue_map, gtpv1u_ue_data_s) gtpv1u_ue_map_head;
- /* Local IP address to use */
- uint32_t sgw_ip_address_for_S1u_S12_S4_up;
- char *ip_addr;
-
- uint16_t seq_num;
- uint8_t restart_counter;
- //gtpv1u_teid2enb_info_t* teid2enb_mapping[];
- hash_table_t *S1U_mapping;
-
-} gtpv1u_data_t;
-
-
-int gtpv1u_init(const mme_config_t *mme_config);
-
-#endif /* GTPV1U_SGW_DEFS_H_ */
diff --git a/openair3/GTPV1-U/gtpv1u_teid_pool.c b/openair3/GTPV1-U/gtpv1u_teid_pool.c
deleted file mode 100644
index ff0ac6f1839040f582ddbeaff7f91153b2a9a9e7..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/gtpv1u_teid_pool.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file gtpv1u_task.c
-* \brief
-* \author Lionel Gauthier
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-*/
-#include <stdlib.h>
-#include <stdint.h>
-
-#include "gtpv1u.h"
-
-//#define GTPV1U_LINEAR_TEID_ALLOCATION 1
-
-#ifdef GTPV1U_LINEAR_TEID_ALLOCATION
-static uint32_t g_gtpv1u_teid = 0;
-#endif
-
-uint32_t gtpv1u_new_teid(void)
-{
-#ifdef GTPV1U_LINEAR_TEID_ALLOCATION
- g_gtpv1u_teid = g_gtpv1u_teid + 1;
- return g_gtpv1u_teid;
-#else
- return random() + random() % (RAND_MAX - 1) + 1;
-#endif
-}
diff --git a/openair3/GTPV1-U/nw-gtpv1u/AUTHORS b/openair3/GTPV1-U/nw-gtpv1u/AUTHORS
deleted file mode 100644
index b068a40fddffeac00e275caa3b266878b6043b0a..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-Amit Chawre
diff --git a/openair3/GTPV1-U/nw-gtpv1u/COPYING b/openair3/GTPV1-U/nw-gtpv1u/COPYING
deleted file mode 100644
index d27832d6c118e514fabc7c05adc32d64b63961a0..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/COPYING
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2010-2011 Amit Chawre <http://www.amitchawre.net/contact.html>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/ChangeLog b/openair3/GTPV1-U/nw-gtpv1u/ChangeLog
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/openair3/GTPV1-U/nw-gtpv1u/NEWS b/openair3/GTPV1-U/nw-gtpv1u/NEWS
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/openair3/GTPV1-U/nw-gtpv1u/README b/openair3/GTPV1-U/nw-gtpv1u/README
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uLog.h b/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uLog.h
deleted file mode 100644
index 3fb5c8dd052f12b446dacb201a73958f19bc2531..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uLog.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 u *
- * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-#ifndef __NW_GTPV1U_LOG_H__
-#define __NW_GTPV1U_LOG_H__
-
-#include <stdio.h>
-#include "NwLog.h"
-
-/**
- * @file NwGtpv1uLog.h
- * @brief This header contains logging related definitions.
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*---------------------------------------------------------------------------
- * Log Macro Definition
- *--------------------------------------------------------------------------*/
-
-#define NW_LOG(_gtpv1uHandle, _logLevel, ...) \
- do { \
- if(((NwGtpv1uStackT*)(_gtpv1uHandle))->logLevel >= _logLevel) \
- { \
- char _logBuf[1024]; \
- snprintf(_logBuf, 1024, __VA_ARGS__); \
- ((NwGtpv1uStackT*)(_gtpv1uHandle))->logMgr.logReqCallback(((NwGtpv1uStackT*)_gtpv1uHandle)->logMgr.logMgrHandle, _logLevel, __FILE__, __LINE__, _logBuf);\
- } \
- } while(0)
-
-#define NW_ENTER(_gtpv1uHandle) \
- do { \
- NW_LOG(_gtpv1uHandle, NW_LOG_LEVEL_DEBG, "Entering '%s'", __func__);\
- } while(0)
-
-#define NW_LEAVE(_gtpv1uHandle) \
- do { \
- NW_LOG(_gtpv1uHandle, NW_LOG_LEVEL_DEBG, "Leaving '%s'", __func__);\
- } while(0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NW_TYPES_H__ */
-
-
-/*--------------------------------------------------------------------------*
- * E N D O F F I L E *
- *--------------------------------------------------------------------------*/
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uPrivate.h b/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uPrivate.h
deleted file mode 100644
index 59ffb1e1746188e9e1f263e337f9e5c5b416933a..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uPrivate.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 u *
- * n w - g t p v 2 u *
- * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-#ifndef __NW_GTPV1U_PRIVATE_H__
-#define __NW_GTPV1U_PRIVATE_H__
-
-#include "tree.h"
-#include "queue.h"
-
-#include "NwTypes.h"
-#include "NwGtpv1uError.h"
-#include "NwGtpv1u.h"
-#include "NwGtpv1uMsg.h"
-
-
-/**
- * @file NwGtpv1uPrivate.h
- * @brief This header file contains nw-gtpv1u private definitions not to be
- * exposed to user application.
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define NW_GTPV1U_MALLOC(_stack, _size, _mem, _type) \
- do { \
- if(((NwGtpv1uStackT*)(_stack))->memMgr.memAlloc && ((NwGtpv1uStackT*)(_stack))->memMgr.memFree )\
- { \
- _mem = (_type) ((NwGtpv1uStackT*) (_stack))->memMgr.memAlloc(((NwGtpv1uStackT*) (_stack))->memMgr.hMemMgr, _size, __FILE__, __LINE__);\
- } \
- else \
- { \
- _mem = (_type) malloc (_size); \
- } \
- } while (0)
-
-/*--------------------------------------------------------------------------*
- * G T P U S T A C K O B J E C T T Y P E D E F I N I T I O N *
- *--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*
- * GRPS Tunneling Protocol Stack Class Definition
- *--------------------------------------------------------------------------*/
-
-/**
- * gtpv1u stack class definition
- */
-
-typedef struct NwGtpv1uStack {
- uint32_t stackType;/**< GTPU_STACK_ENB or GTPU_STACK_SGW */
- NwPtrT id;
- uint32_t seq;
- NwGtpv1uUlpEntityT ulp;
- NwGtpv1uUdpEntityT udp;
- NwGtpv1uMemMgrEntityT memMgr;
- NwGtpv1uTimerMgrEntityT tmrMgr;
- NwGtpv1uLogMgrEntityT logMgr;
- uint32_t logLevel;
- RB_HEAD( NwGtpv1uOutstandingTxSeqNumTrxnMap, NwGtpv1uTrxn) outstandingTxSeqNumMap;
- RB_HEAD( NwGtpv1uOutstandingRxSeqNumTrxnMap, NwGtpv1uTrxn) outstandingRxSeqNumMap;
- RB_HEAD(NwGtpv1uTunnelEndPointTMap, NwGtpv1uTunnelEndPoint) sessionMap;
- RB_HEAD(NwGtpv1uTunnelEndPointIdentifierMap, NwGtpv1uTunnelEndPoint) teidMap;
-} NwGtpv1uStackT;
-
-/**
- * GTP Tunnel End Point class definition
- */
-
-typedef struct NwGtpv1uTunnelEndPoint {
- uint32_t teid; /**< Gtpu Tunnel End Point Identifier */
- uint32_t peerAddr; /**< Peer IP address for the session */
- NwGtpv1uStackT* pStack; /**< Pointer to the parent stack */
- NwGtpv1uUlpSessionHandleT hUlpSession; /**< ULP session handle for the session */
- RB_ENTRY (NwGtpv1uTunnelEndPoint) sessionMapRbtNode; /**< RB Tree Data Structure Node */
- struct NwGtpv1uTunnelEndPoint *next;
-} NwGtpv1uTunnelEndPointT;
-
-
-/*--------------------------------------------------------------------------*
- * Timeout Info Type Definition
- *--------------------------------------------------------------------------*/
-
-/**
- * gtpv1u timeout info
- */
-
-typedef struct NwGtpv1uTimeoutInfo {
- NwGtpv1uStackHandleT hStack;
- void* timeoutArg;
- NwGtpv1uRcT (*timeoutCallbackFunc)(void*);
-} NwGtpv1uTimeoutInfoT;
-
-/**
- * Start a transaction response timer
- *
- * @param[in] thiz Pointer to stack instance
- * @param[in] timeoutArg Arg to timeout function.
- * @param[out] phTmr Pointer to timer handle.
- * @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpStartTrxnPeerRspTimer(NwGtpv1uStackT* thiz, NwGtpv1uTimeoutInfoT* timeoutInfo, NwGtpv1uTimerHandleT* phTmr);
-
-/**
- * Stop a transaction response timer
- *
- * @param[in] thiz Pointer to stack instance
- * @param[out] phTmr Pointer to timer handle.
- * @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpStopTrxnPeerRspTimer(NwGtpv1uStackT* thiz, NwGtpv1uTimerHandleT* phTmr);
-
-
-#define NW_GTPV1U_MAX_MSG_LEN (4096) /**< Maximum supported gtpv1u packet length including header */
-
-/**
- * NwGtpv1uMsgT holds gtpv1u messages to/from the peer.
- */
-typedef struct NwGtpv1uMsg {
- uint8_t version;
- uint8_t protocolType;
- uint8_t extHdrFlag;
- uint8_t seqNumFlag;
- uint16_t npduNumFlag;
- uint32_t msgType;
- uint16_t msgLen;
- uint32_t teid;
- uint16_t seqNum;
- uint8_t npduNum;
- uint8_t nextExtHdrType;
- uint8_t* msgBuf;
- uint32_t msgBufLen;
- uint32_t msgBufOffset;
- struct NwGtpv1uMsg* next;
-} NwGtpv1uMsgT;
-
-
-/*--------------------------------------------------------------------------*
- * R6/R4 Transaction Context Type Definition
- *--------------------------------------------------------------------------*/
-
-/**
- * Transaction structure
- */
-
-typedef struct NwGtpv1uTrxn {
- uint32_t seqNum;
- uint32_t peerIp;
- uint32_t peerPort;
- uint8_t maxRetries;
- uint8_t t3Timer;
- NwGtpv1uTimerHandleT hRspTmr;
- NwGtpv1uTimeoutInfoT peerRspTimeoutInfo;
- NwGtpv1uStackT* pStack;
- NwGtpv1uTunnelEndPointT* pSession;
- uint32_t hUlpTrxn;
- NwGtpv1uMsgT* pMsg;
- RB_ENTRY (NwGtpv1uTrxn) outstandingTxSeqNumMapRbtNode; /**< RB Tree Data Structure Node */
- RB_ENTRY (NwGtpv1uTrxn) outstandingRxSeqNumMapRbtNode; /**< RB Tree Data Structure Node */
- struct NwGtpv1uTrxn* next;
-} NwGtpv1uTrxnT;
-
-
-/**
- * GTPv2 message header structure
- */
-
-#pragma pack(1)
-
-typedef struct NwGtpv1uMsgHeader {
- uint8_t PN:1;
- uint8_t S:1;
- uint8_t E:1;
- uint8_t spare:1;
- uint8_t PT:1;
- uint8_t version:3;
- uint8_t msgType;
- uint16_t msgLength;
- uint32_t teid;
-} NwGtpv1uMsgHeaderT;
-
-#pragma pack()
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NW_GTPV1U_PRIVATE_H__ */
-/*--------------------------------------------------------------------------*
- * E N D O F F I L E *
- *--------------------------------------------------------------------------*/
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTrxn.h b/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTrxn.h
deleted file mode 100644
index 76228416a96a1ee2cd72aeeaecb9c95b00fe13ca..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTrxn.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 u *
- * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-/**
- * @file NwGtpv1uTrxn.h
- * @author Amit Chawre
- * @brief
- *
- * This header file contains required definitions and functions
- * prototypes used by gtpv1u transactions.
- *
- **/
-
-
-#ifndef __NW_GTPV1U_TRXN_H__
-#define __NW_GTPV1U_TRXN_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-NwGtpv1uRcT
-nwGtpv1uTrxnNew( NW_IN NwGtpv1uStackT* thiz,
- NW_OUT NwGtpv1uTrxnT **ppTrxn);
-
-
-NwGtpv1uRcT
-nwGtpv1uTrxnWithSeqNew( NW_IN NwGtpv1uStackT* thiz,
- NW_IN uint32_t seqNum,
- NW_OUT NwGtpv1uTrxnT **ppTrxn);
-
-NwGtpv1uRcT
-nwGtpv1uTrxnDelete( NW_INOUT NwGtpv1uTrxnT **ppTrxn);
-
-NwGtpv1uRcT
-nwGtpv1uTrxnNew( NW_IN NwGtpv1uStackT* thiz,
- NW_OUT NwGtpv1uTrxnT **ppTrxn);
-
-NwGtpv1uRcT
-nwGtpv1uTrxnDelete( NW_INOUT NwGtpv1uTrxnT **pthiz);
-
-NwGtpv1uRcT
-nwGtpv1uTrxnCreateAndSendMsg( NW_IN NwGtpv1uStackT* thiz,
- NW_IN NwGtpv1uTrxnT *pTrxn,
- NW_IN uint32_t peerIp,
- NW_IN uint32_t peerPort,
- NW_IN NwGtpv1uMsgT *pMsg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NW_GTPV1U_TRXN_H__ */
-
-/*--------------------------------------------------------------------------*
- * E N D O F F I L E *
- *--------------------------------------------------------------------------*/
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTunnelEndPoint.h b/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTunnelEndPoint.h
deleted file mode 100644
index dc4fbab26423043cada719fc3948f7b663c0272a..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTunnelEndPoint.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 u *
- * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "NwTypes.h"
-#include "NwUtils.h"
-#include "NwGtpv1uError.h"
-#include "NwGtpv1uPrivate.h"
-#include "NwGtpv1uMsg.h"
-#include "NwGtpv1u.h"
-#include "NwGtpv1uLog.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#ifndef __NW_GTPV1U_CONNECTION_H__
-#define __NW_GTPV1U_CONNECTION_H__
-
-/**
- Constructor
-
- @return Pointer to session on success, NULL n failure.
- */
-
-NwGtpv1uTunnelEndPointT*
-nwGtpTunnelEndPointNew(struct NwGtpv1uStack* pStack);
-
-/**
- Destructor
-
- @param[in] thiz: Pointer to session
- @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpTunnelEndPointDestroy(struct NwGtpv1uStack* pStack, NwGtpv1uTunnelEndPointT* thiz);
-
-NwGtpv1uRcT
-nwGtpSessionSendMsgApiToUlpEntity(NwGtpv1uTunnelEndPointT* thiz,
- NwGtpv1uMsgT *pMsg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/*--------------------------------------------------------------------------*
- * E N D O F F I L E *
- *--------------------------------------------------------------------------*/
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1u.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1u.h
deleted file mode 100644
index c6f7c3d6facc1de1197e81e0939f2be7326ce3c1..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1u.h
+++ /dev/null
@@ -1,562 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 u *
- * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-#ifndef __NW_GTPV1U_H__
-#define __NW_GTPV1U_H__
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include "NwTypes.h"
-#include "NwGtpv1uError.h"
-
-
-/**
- * @file NwGtpv1u.h
- * @author Amit Chawre
- * @brief
- *
- * This header file contains all required definitions and functions
- * prototypes for using nw-gtpv1u library.
- *
- **/
-
-#define NW_GTPU_VERSION (0x01)
-#define NW_GTP_PROTOCOL_TYPE_GTP (0x01)
-#define NW_GTP_PROTOCOL_TYPE_GTP_PRIME (0x00)
-
-/*--------------------------------------------------------------------------*
- * S H A R E D A P I M A C R O S *
- *--------------------------------------------------------------------------*/
-
-#define NW_GTP_ECHO_REQ (1)
-#define NW_GTP_ECHO_RSP (2)
-#define NW_GTP_ERROR_INDICATION (26)
-#define NW_GTP_SUPPORTED_EXTENSION_HEADER_INDICATION (31)
-#define NW_GTP_END_MARKER (254)
-#define NW_GTP_GPDU (255)
-
-/*---------------------------------------------------------------------------
- * Opaque Gtpv2 Stack Handles
- *--------------------------------------------------------------------------*/
-
-typedef NwPtrT NwGtpv1uStackHandleT; /**< Gtpv2 Stack Handle */
-typedef NwPtrT NwGtpv1uUlpHandleT; /**< Gtpv2 Stack Ulp Entity Handle */
-typedef NwPtrT NwGtpv1uUdpHandleT; /**< Gtpv2 Stack Udp Entity Handle */
-typedef NwPtrT NwGtpv1uMemMgrHandleT; /**< Gtpv2 Stack Mem Manager Handle */
-typedef NwPtrT NwGtpv1uTimerMgrHandleT; /**< Gtpv2 Stack Timer Manager Handle */
-typedef NwPtrT NwGtpv1uLogMgrHandleT; /**< Gtpv2 Stack Log Mnagaer Handle */
-typedef NwPtrT NwGtpv1uTimerHandleT; /**< Gtpv2 Stack Timer Handle */
-typedef NwPtrT NwGtpv1uMsgHandleT; /**< Gtpv2 Msg Handle */
-
-typedef struct NwGtpv1uStackConfig {
- uint16_t udpSrcPort;
-} NwGtpv1uStackConfigT;
-
-/*--------------------------------------------------------------------------*
- * S T A C K A P I D E F I N I T I O N S *
- *--------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------
- * Gtpv2 Stack ULP API type definitions
- *--------------------------------------------------------------------------*/
-
-/**
- * APIs types between ULP and Stack
- */
-
-typedef enum {
- /* APIs from ULP to stack */
-
- NW_GTPV1U_ULP_API_CREATE_TUNNEL_ENDPOINT = 0x00000000, /**< Create a local teid context on stack */
- NW_GTPV1U_ULP_API_DESTROY_TUNNEL_ENDPOINT, /**< Delete a local teid context on stack */
- NW_GTPV1U_ULP_API_INITIAL_REQ, /**< Send a Initial Request over a session */
- NW_GTPV1U_ULP_API_TRIGGERED_REQ, /**< Send a Initial Request over a session */
- NW_GTPV1U_ULP_API_TRIGGERED_RSP, /**< Send a Trigger Response over a session */
- NW_GTPV1U_ULP_API_SEND_TPDU, /**< Send a T-PDU message over teid context */
-
- /* APIs from stack to ULP */
-
- NW_GTPV1U_ULP_API_RECV_TPDU, /**< Receive a gtpv1u T-PDU from stack */
- NW_GTPV1U_ULP_API_RECV_MSG, /**< Receive a gtpv1u message from stack */
- NW_GTPV1U_ULP_API_RSP_FAILURE, /**< Rsp failure for gtpv2 message from stack */
-
- /* Do not add below this */
-
- NW_GTPV1U_ULP_API_END = 0xFFFFFFFF,
-} NwGtpv1uUlpApiTypeT;
-
-/*---------------------------------------------------------------------------
- * Gtpv2 Stack API information elements definitions
- *--------------------------------------------------------------------------*/
-
-typedef NwPtrT NwGtpv1uStackSessionHandleT;/**< Gtpv2 Stack session Handle */
-typedef uint8_t NwGtpv1uMsgTypeT; /**< Gtpv2 Msg Type */
-typedef NwPtrT NwGtpv1uTrxnHandleT; /**< Gtpv2 Transaction Handle */
-typedef NwPtrT NwGtpv1uUlpTrxnHandleT; /**< Gtpv2 Ulp Transaction Handle */
-typedef NwPtrT NwGtpv1uUlpSessionHandleT; /**< Gtpv2 Ulp session Handle */
-
-/**
- * API information elements between ULP and Stack for
- * creating a session.
- */
-
-typedef struct {
- NW_IN uint32_t teid;
- NW_IN NwGtpv1uUlpSessionHandleT hUlpSession;
- NW_OUT NwGtpv1uStackSessionHandleT hStackSession;
-} NwGtpv1uCreateTunnelEndPointT;
-
-/**
- * API information elements between ULP and Stack for
- * destroying a session.
- */
-
-typedef struct {
- NW_IN NwGtpv1uStackSessionHandleT hStackSessionHandle;
-} NwGtpv1uDestroyTunnelEndPointT;
-
-/**
- * API information elements between ULP and Stack for
- * sending a Gtpv1u initial message.
- */
-
-typedef struct {
- NW_IN NwGtpv1uUlpTrxnHandleT hUlpTrxn;
- NW_IN uint32_t peerIp;
- NW_IN uint32_t peerPort;
- NW_IN uint8_t flags;
- NW_IN uint32_t teid;
-} NwGtpv1uInitialReqInfoT;
-
-/**
- * API information elements between ULP and Stack for
- * sending a Gtpv1u triggered response message.
- */
-
-typedef struct {
- NW_IN NwGtpv1uUlpTrxnHandleT hUlpTrxn;
- NW_IN uint32_t peerIp;
- NW_IN uint32_t peerPort;
- NW_IN uint8_t flags;
- NW_IN uint32_t teid;
- NW_IN uint32_t seqNum;
- NW_IN NwGtpv1uMsgHandleT hMsg;
-} NwGtpv1uTriggeredRspInfoT;
-
-/**
- * API information elements between ULP and Stack for
- * sending a Gtpv1u triggered request message.
- */
-
-typedef struct {
- NW_IN NwGtpv1uUlpTrxnHandleT hUlpTrxn;
- NW_IN uint32_t peerIp;
- NW_IN uint32_t peerPort;
- NW_IN uint8_t flags;
- NW_IN uint32_t teid;
- NW_IN uint32_t seqNum;
- NW_IN NwGtpv1uMsgHandleT hMsg;
-} NwGtpv1uTriggeredReqInfoT;
-
-
-/**
- * API information elements between ULP and Stack for
- * sending a Gtpv2 message over a session.
- */
-
-typedef struct {
- NW_IN uint32_t teid;
- NW_IN uint32_t ipAddr;
- NW_IN uint8_t flags;
- NW_IN NwGtpv1uMsgHandleT hMsg;
-} NwGtpv1uSendtoInfoT;
-
-
-/**
- * API information elements between ULP and Stack for
- * sending a Gtpv2 message over a session.
- */
-
-typedef struct {
- NW_OUT NwGtpv1uStackSessionHandleT hStackSessionHandle;
- NW_INOUT NwGtpv1uTrxnHandleT hTrxn;
- NW_IN NwGtpv1uUlpTrxnHandleT hUlpTrxn;
- NW_IN NwGtpv1uMsgTypeT msgType;
- NW_IN uint8_t flags;
- NW_IN NwGtpv1uMsgHandleT hMsg;
-} NwGtpv1uSendMsgInfoT;
-
-/**
- * API information elements between ULP and Stack for
- * receiving a Gtpv2 message over a session from stack.
- */
-
-typedef struct {
- NW_IN NwGtpv1uUlpSessionHandleT hUlpSession;
- NW_IN NwGtpv1uUlpTrxnHandleT hUlpTrxn;
- NW_IN uint32_t teid;
- NW_IN uint32_t peerIp;
- NW_IN uint32_t peerPort;
- NW_IN uint32_t msgType; /**< Message type */
- NW_IN NwGtpv1uMsgHandleT hMsg; /**< Gtp Message handle */
-} NwGtpv1uRecvMsgInfoT;
-
-/**
- * API information elements between ULP and Stack for
- * receiving a Gtpv2 message over a session from stack.
- */
-
-typedef struct {
- NW_IN NwGtpv1uUlpSessionHandleT hUlpSession;
- NW_IN NwGtpv1uTrxnHandleT hTrxn;
-} NwGtpv1uNackInfoT;
-
-/*---------------------------------------------------------------------------
- * Gtpv2 Stack API structure definition
- *--------------------------------------------------------------------------*/
-
-/**
- * API structure between ULP and Stack
- */
-
-typedef struct {
- NwGtpv1uUlpApiTypeT apiType;
- NwGtpv1uMsgHandleT hMsg;
- union {
- NwGtpv1uCreateTunnelEndPointT createTunnelEndPointInfo;
- NwGtpv1uDestroyTunnelEndPointT destroyTunnelEndPointInfo;
- NwGtpv1uInitialReqInfoT initialReqInfo;
- NwGtpv1uTriggeredRspInfoT triggeredRspInfo;
- NwGtpv1uTriggeredReqInfoT triggeredReqInfo;
- NwGtpv1uSendtoInfoT sendtoInfo;
- NwGtpv1uSendMsgInfoT sendMsgInfo;
- NwGtpv1uRecvMsgInfoT recvMsgInfo;
- NwGtpv1uNackInfoT nackMsgInfo;
- } apiInfo;
-} NwGtpv1uUlpApiT;
-
-
-/*--------------------------------------------------------------------------*
- * S T A C K E N T I T I E S D E F I N I T I O N S *
- *--------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------
- * ULP Entity Definitions
- *--------------------------------------------------------------------------*/
-
-/**
- * Gtpv2 ULP entity definition
- */
-
-typedef struct {
- NwGtpv1uUlpHandleT hUlp;
- NwGtpv1uRcT (*ulpReqCallback) ( NW_IN NwGtpv1uUlpHandleT hUlp,
- NW_IN NwGtpv1uUlpApiT *pUlpApi);
-} NwGtpv1uUlpEntityT;
-
-
-/*---------------------------------------------------------------------------
- * UDP Entity Definitions
- *--------------------------------------------------------------------------*/
-
-/**
- * Gtpv2 UDP entity definition
- */
-
-typedef struct {
- NwGtpv1uUdpHandleT hUdp;
- NwGtpv1uRcT (*udpDataReqCallback) ( NW_IN NwGtpv1uUdpHandleT udpHandle,
- NW_IN uint8_t* dataBuf,
- NW_IN uint32_t dataSize,
- NW_IN uint32_t dataOffset,
- NW_IN uint32_t peerIP,
- NW_IN uint16_t peerPort);
-} NwGtpv1uUdpEntityT;
-
-/**
- * Gtpv1u Memory Manager entity definition
- */
-
-typedef struct {
- NwGtpv1uMemMgrHandleT hMemMgr;
- void* (*memAlloc)( NW_IN NwGtpv1uMemMgrHandleT hMemMgr,
- NW_IN uint32_t memSize,
- NW_IN NwCharT* fileName,
- NW_IN uint32_t lineNumber);
-
- void (*memFree) ( NW_IN NwGtpv1uMemMgrHandleT hMemMgr,
- NW_IN void* hMem,
- NW_IN NwCharT* fileName,
- NW_IN uint32_t lineNumber);
-} NwGtpv1uMemMgrEntityT;
-
-
-/*---------------------------------------------------------------------------
- * Timer Entity Definitions
- *--------------------------------------------------------------------------*/
-
-#define NW_GTPV1U_TMR_TYPE_ONE_SHOT (0)
-#define NW_GTPV1U_TMR_TYPE_REPETITIVE (1)
-
-/**
- * Gtpv2 Timer Manager entity definition
- */
-
-typedef struct {
- NwGtpv1uTimerMgrHandleT tmrMgrHandle;
- NwGtpv1uRcT (*tmrStartCallback)( NW_IN NwGtpv1uTimerMgrHandleT tmrMgrHandle,
- NW_IN uint32_t timeoutSecs,
- NW_IN uint32_t timeoutUsec,
- NW_IN uint32_t tmrType,
- NW_IN void* tmrArg,
- NW_OUT NwGtpv1uTimerHandleT* tmrHandle);
-
- NwGtpv1uRcT (*tmrStopCallback) ( NW_IN NwGtpv1uTimerMgrHandleT tmrMgrHandle,
- NW_IN NwGtpv1uTimerHandleT tmrHandle);
-} NwGtpv1uTimerMgrEntityT;
-
-
-/*---------------------------------------------------------------------------
- * Log Entity Definitions
- *--------------------------------------------------------------------------*/
-
-/**
- * Gtpv2 Log manager entity definition
- */
-
-typedef struct {
- NwGtpv1uLogMgrHandleT logMgrHandle;
- NwGtpv1uRcT (*logReqCallback) (NW_IN NwGtpv1uLogMgrHandleT logMgrHandle,
- NW_IN uint32_t logLevel,
- NW_IN NwCharT* file,
- NW_IN uint32_t line,
- NW_IN NwCharT* logStr);
-} NwGtpv1uLogMgrEntityT;
-
-
-/*--------------------------------------------------------------------------*
- * P U B L I C F U N C T I O N S *
- *--------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*---------------------------------------------------------------------------
- * Constructor
- *--------------------------------------------------------------------------*/
-
-/**
- Initialize the nw-gtpv1u stack.
-
- @param[in,out] phGtpv1uStackHandle : Pointer to stack handle
- @param[in] stackType : GTPU_STACK_ENB or GTPU_STACK_SGW
- */
-
-NwGtpv1uRcT
-nwGtpv1uInitialize( NW_INOUT NwGtpv1uStackHandleT* phGtpv1uStackHandle, uint32_t stackType);
-
-/*---------------------------------------------------------------------------
- * Destructor
- *--------------------------------------------------------------------------*/
-
-/**
- Destroy the nw-gtpv1u stack.
-
- @param[in] hGtpv1uStackHandle : Stack handle
- */
-
-NwGtpv1uRcT
-nwGtpv1uFinalize( NW_IN NwGtpv1uStackHandleT hGtpv1uStackHandle);
-
-/*---------------------------------------------------------------------------
- * Configuration Get/Set Operations
- *--------------------------------------------------------------------------*/
-
-/**
- Set Configuration for the nw-gtpv1u stack.
-
- @param[in,out] phGtpv1uStackHandle : Pointer to stack handle
- */
-
-NwGtpv1uRcT
-NwGtpv1uConfigSet( NW_IN NwGtpv1uStackHandleT* phGtpv1uStackHandle, NW_IN NwGtpv1uStackConfigT* pConfig);
-
-/**
- Get Configuration for the nw-gtpv1u stack.
-
- @param[in,out] phGtpv1uStackHandle : Pointer to stack handle
- */
-
-NwGtpv1uRcT
-NwGtpv1uConfigGet( NW_IN NwGtpv1uStackHandleT* phGtpv1uStackHandle, NW_OUT NwGtpv1uStackConfigT* pConfig);
-
-/**
- Set ULP entity for the stack.
-
- @param[in] hGtpv1uStackHandle : Stack handle
- @param[in] pUlpEntity : Pointer to ULP entity.
- @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpv1uSetUlpEntity( NW_IN NwGtpv1uStackHandleT hGtpv1uStackHandle,
- NW_IN NwGtpv1uUlpEntityT* pUlpEntity);
-
-/**
- Set UDP entity for the stack.
-
- @param[in] hGtpv1uStackHandle : Stack handle
- @param[in] pUdpEntity : Pointer to UDP entity.
- @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpv1uSetUdpEntity( NW_IN NwGtpv1uStackHandleT hGtpv1uStackHandle,
- NW_IN NwGtpv1uUdpEntityT* pUdpEntity);
-
-/**
- Set MemMgr entity for the stack.
-
- @param[in] hGtpv1uStackHandle : Stack handle
- @param[in] pMemMgr : Pointer to Memory Manager.
- @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpv1uSetMemMgrEntity( NW_IN NwGtpv1uStackHandleT hGtpv1uStackHandle,
- NW_IN NwGtpv1uMemMgrEntityT* pMemMgr);
-
-
-/**
- Set TmrMgr entity for the stack.
-
- @param[in] hGtpv1uStackHandle : Stack handle
- @param[in] pTmrMgr : Pointer to Timer Manager.
- @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpv1uSetTimerMgrEntity( NW_IN NwGtpv1uStackHandleT hGtpv1uStackHandle,
- NW_IN NwGtpv1uTimerMgrEntityT* pTmrMgr);
-
-/**
- Set LogMgr entity for the stack.
-
- @param[in] hGtpv1uStackHandle : Stack handle
- @param[in] pLogMgr : Pointer to Log Manager.
- @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpv1uSetLogMgrEntity( NW_IN NwGtpv1uStackHandleT hGtpv1uStackHandle,
- NW_IN NwGtpv1uLogMgrEntityT* pLogMgr);
-
-/**
- Set log level for the stack.
-
- @param[in] hGtpv1uStackHandle : Stack handle
- @param[in] logLevel : Log level.
- @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpv1uSetLogLevel( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN uint32_t logLevel);
-/*---------------------------------------------------------------------------
- * Process Request from Udp Layer
- *--------------------------------------------------------------------------*/
-
-/**
- Process Data Request from UDP entity.
-
- @param[in] hGtpv1uStackHandle : Stack handle
- @param[in] udpData : Pointer to received UDP data.
- @param[in] udpDataLen : Received data length.
- @param[in] dstPort : Received on port.
- @param[in] from : Received from peer information.
- @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpv1uProcessUdpReq( NW_IN NwGtpv1uStackHandleT hGtpv1uStackHandle,
- NW_IN uint8_t* udpData,
- NW_IN uint32_t udpDataLen,
- NW_IN uint16_t peerPort,
- NW_IN uint32_t peerIP);
-
-/*---------------------------------------------------------------------------
- * Process Request from Upper Layer
- *--------------------------------------------------------------------------*/
-
-/**
- Process Request from ULP entity.
-
- @param[in] hGtpv1uStackHandle : Stack handle
- @param[in] pLogMgr : Pointer to Ulp Req.
- @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpv1uProcessUlpReq( NW_IN NwGtpv1uStackHandleT hGtpv1uStackHandle,
- NW_IN NwGtpv1uUlpApiT *ulpReq);
-
-
-/*---------------------------------------------------------------------------
- * Process Timer timeout Request from Timer Manager
- *--------------------------------------------------------------------------*/
-
-/**
- Process Timer timeout Request from Timer Manager
-
- @param[in] pLogMgr : Pointer timeout arguments.
- @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpv1uProcessTimeout( NW_IN void* timeoutArg);
-
-NwGtpv1uRcT
-nwGtpv1uPeerRspTimeout(void* arg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NW_GTPV1U_H__ */
-
-/*--------------------------------------------------------------------------*
- * E N D O F F I L E *
- *--------------------------------------------------------------------------*/
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uError.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uError.h
deleted file mode 100644
index 6da3b80dfacbbde24fc532e4617040586f40e711..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uError.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 c *
- * G P R S T u n n e l i n g P r o t o c o l v 2 c S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-
-#ifndef __NW_GTPV1U_ERROR_H__
-#define __NW_GTPV1U_ERROR_H__
-
-/**
- * @file NwGtpv1uError.h
- * @brief This header file contains return error code type definitions.
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef enum {
-
- NW_GTPV1U_OK = 0x00000000,
- NW_GTPV1U_MANDATORY_IE_DUPLICATE,
- NW_GTPV1U_MANDATORY_IE_MISSING,
- NW_GTPV1U_MSG_MALFORMED,
- NW_GTPV1U_FAILURE = 0xFFFFFFFE
-}
-NwGtpv1uRcT;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NW_GTPV1U_ERROR_H__*/
-
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uIe.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uIe.h
deleted file mode 100644
index 7bb51dcda0eafb186446899c3837071aeceef10f..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uIe.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 u *
- * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-/**
- * @file NwGtpv1uIe.h
- * @brief This header file contains Information Element definitions for GTPv1u
- * as per 3GPP TS 29281-930.
-*/
-
-#ifndef __NW_GTPV1U_IE_H__
-#define __NW_GTPV1U_IE_H__
-
-/*--------------------------------------------------------------------------*
- * G T P V 2 U I E T Y P E M A C R O D E F I N I T I O N S *
- *--------------------------------------------------------------------------*/
-
-#define NW_GTPV1U_IE_RECOVERY (14)
-#define NW_GTPV1U_IE_TEID_DATA_I (15)
-#define NW_GTPV1U_IE_GSN_ADDRESS (133)
-#define NW_GTPV1U_IE_EXT_HDR_TYPE_LIST (141)
-#define NW_GTPV1U_IE_PRIVATE_EXTENSION (255)
-
-
-/*--------------------------------------------------------------------------*
- * G T P V 2 U C A U S E V A L U E D E F I N I T I O N S *
- *--------------------------------------------------------------------------*/
-
-#define NW_GTPV1U_CAUSE_REQUEST_ACCEPTED (16)
-#define NW_GTPV1U_CAUSE_MANDATORY_IE_MISSING (70)
-
-#endif /* __NW_GTPV1U_IE_H__ */
-
-/*--------------------------------------------------------------------------*
- * E N D O F F I L E *
- *--------------------------------------------------------------------------*/
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uMsg.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uMsg.h
deleted file mode 100644
index f6bc0415f2aa7df3d313a5ebfab082cee7f4fde9..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uMsg.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 u *
- * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-#ifndef __NW_GTPV1U_MSG_H__
-#define __NW_GTPV1U_MSG_H__
-
-#include "NwTypes.h"
-#include "NwGtpv1u.h"
-
-/**
- * @file NwGtpv1uMsg.h
- * @brief This file defines APIs for to build new outgoing gtpv1u messages and to parse incoming messages.
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*--------------------------------------------------------------------------*
- * G T P V 2 C I E D A T A - T Y P E D E F I N I T I O N S *
- *--------------------------------------------------------------------------*/
-
-#pragma pack(1)
-
-typedef struct NwGtpv1uIeTv1 {
- uint8_t t;
- uint8_t v;
-} NwGtpv1uIeTv1T;
-
-typedef struct NwGtpv1uIeTv2 {
- uint8_t t;
- uint8_t v;
-} NwGtpv1uIeTv2T;
-
-typedef struct NwGtpv1uIeTv4 {
- uint8_t t;
- uint32_t v;
-} NwGtpv1uIeTv4T;
-
-typedef struct NwGtpv1uIeTlv {
- uint8_t t;
- uint16_t l;
-} NwGtpv1uIeTlvT;
-
-#pragma pack()
-
-
-/**
- * Allocate a GPDU gtpv1u message.
- *
- * @param[in] hGtpuStackHandle : gtpv1u stack handle.
- * @param[in] teidPresent : TEID is present flag.
- * @param[in] teid : TEID for this message.
- * @param[in] seqNum : Sequence number for this message.
- * @param[out] phMsg : Pointer to message handle.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN uint8_t seqNumFlag,
- NW_IN uint8_t npduNumFlag,
- NW_IN uint8_t extHdrFlag,
- NW_IN uint8_t msgType,
- NW_IN uint8_t teid,
- NW_IN uint16_t seqNum,
- NW_IN uint8_t npduNum,
- NW_IN uint8_t nextExtHeader,
- NW_OUT NwGtpv1uMsgHandleT *phMsg);
-
-
-/**
- * Allocate a gtpv1u message.
- *
- * @param[in] hGtpuStackHandle : gtpv1u stack handle.
- * @param[in] teid : TEID for this message.
- * @param[in] seqNumFlag : Sequence number flag for this message.
- * @param[in] seqNum : Sequence number for this message.
- * @param[in] pTpdu: T-PDU for this message.
- * @param[in] tpduLength: T-PDU length for this message.
- * @param[out] phMsg : Pointer to message handle.
- */
-
-NwGtpv1uRcT
-nwGtpv1uGpduMsgNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN uint32_t teid,
- NW_IN uint8_t seqNumFlag,
- NW_IN uint16_t seqNum,
- NW_IN uint8_t* tpdu,
- NW_IN uint16_t tpduLength,
- NW_IN uint32_t tpduOffset,
- NW_OUT NwGtpv1uMsgHandleT *phMsg);
-
-/**
- * Allocate a gtpv1u message from another gtpv1u message.
- *
- * @param[in] hGtpuStackHandle : gtpv1u stack handle.
- * @param[out] hMsg : Handle to input message.
- * @param[out] phMsg : Pointer to message handle.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgFromMsgNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN NwGtpv1uMsgHandleT hMsg,
- NW_OUT NwGtpv1uMsgHandleT *phMsg);
-/**
- * Allocate a gtpv1u message from data buffer.
- *
- * @param[in] hGtpuStackHandle : gtpv1u stack handle.
- * @param[in] pBuf: Buffer to be copied in this message.
- * @param[in] bufLen: Buffer length to be copied in this message.
- * @param[out] phMsg : Pointer to message handle.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgFromBufferNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN uint8_t* pBuf,
- NW_IN uint32_t bufLen,
- NW_OUT NwGtpv1uMsgHandleT *phMsg);
-
-/**
- * Free a gtpv1u message.
- *
- * @param[in] hGtpuStackHandle : gtpv1u stack handle.
- * @param[in] hMsg : Message handle.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgDelete( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN NwGtpv1uMsgHandleT hMsg);
-
-/**
- * Set TEID for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- * @param[in] teid: TEID value.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgSetTeid(NW_IN NwGtpv1uMsgHandleT hMsg, uint32_t teid);
-
-/**
- * Set TEID present flag for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- * @param[in] teidPesent: Flag boolean value.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgSetTeidPresent(NW_IN NwGtpv1uMsgHandleT hMsg, NwBoolT teidPresent);
-
-/**
- * Set sequence for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- * @param[in] seqNum: Flag boolean value.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgSetSeqNumber(NW_IN NwGtpv1uMsgHandleT hMsg, uint32_t seqNum);
-
-/**
- * Get TEID present for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- */
-
-uint32_t
-nwGtpv1uMsgGetTeid(NW_IN NwGtpv1uMsgHandleT hMsg);
-
-/**
- * Get TEID present for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- */
-
-NwBoolT
-nwGtpv1uMsgGetTeidPresent(NW_IN NwGtpv1uMsgHandleT hMsg);
-
-/**
- * Get sequence number for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- */
-
-uint32_t
-nwGtpv1uMsgGetSeqNumber(NW_IN NwGtpv1uMsgHandleT hMsg);
-
-/**
- * Get tpdu for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- * @param[inout] pTpduBuf : Buffer to copy the T-PDU.
- * @param[out] hMsg : T-PDU length.
- */
-
-uint32_t
-nwGtpv1uMsgGetTpdu(NW_IN NwGtpv1uMsgHandleT hMsg, uint8_t* pTpduBuf, uint32_t* pTpduLength);
-
-uint8_t*
-nwGtpv1uMsgGetTpduHandle(NW_IN NwGtpv1uMsgHandleT hMsg);
-
-uint32_t
-nwGtpv1uMsgGetTpduLength(NW_IN NwGtpv1uMsgHandleT hMsg);
-
-/**
- * Add a gtpv1u information element of length 1 to gtpv1u mesasge.
- *
- * @param[in] hMsg : Handle to gtpv1u message.
- * @param[in] type : IE type.
- * @param[in] value : IE value.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgAddIeTV1(NW_IN NwGtpv1uMsgHandleT hMsg,
- NW_IN uint8_t type,
- NW_IN uint8_t value);
-
-
-/**
- * Add a gtpv1u information element of length 2 to gtpv1u mesasge.
- *
- * @param[in] hMsg : Handle to gtpv1u message.
- * @param[in] type : IE type.
- * @param[in] value : IE value.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgAddIeTV2(NW_IN NwGtpv1uMsgHandleT hMsg,
- NW_IN uint8_t type,
- NW_IN uint16_t length,
- NW_IN uint16_t value);
-
-
-/**
- * Add a gtpv1u information element of length 4 to gtpv1u mesasge.
- *
- * @param[in] hMsg : Handle to gtpv1u message.
- * @param[in] type : IE type.
- * @param[in] value : IE value.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgAddIeTV4(NW_IN NwGtpv1uMsgHandleT hMsg,
- NW_IN uint8_t type,
- NW_IN uint16_t length,
- NW_IN uint32_t value);
-
-
-/**
- * Add a gtpv1u information element of variable length to gtpv1u mesasge.
- *
- * @param[in] hMsg : Handle to gtpv1u message.
- * @param[in] type : IE type.
- * @param[in] length : IE length.
- * @param[in] value : IE value.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgAddIe(NW_IN NwGtpv1uMsgHandleT hMsg,
- NW_IN uint8_t type,
- NW_IN uint16_t length,
- NW_IN uint8_t* pVal);
-
-/**
- * Dump the contents of gtpv1u mesasge.
- *
- * @param[in] hMsg : Handle to gtpv1u message.
- * @param[in] fp: Pointer to output file.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgHexDump(NwGtpv1uMsgHandleT hMsg, FILE* fp);
-
-uint32_t
-nwGtpv1uMsgGetMsgType(NW_IN NwGtpv1uMsgHandleT hMsg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NW_TYPES_H__ */
-
-
-/*--------------------------------------------------------------------------*
- * E N D O F F I L E *
- *--------------------------------------------------------------------------*/
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/shared/NwLog.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwLog.h
deleted file mode 100644
index 7215216e68a19bc8ece8c3ca749eff962c8e3baa..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/shared/NwLog.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 c *
- * G P R S T u n n e l i n g P r o t o c o l v 2 c S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-
-#ifndef __NW_LOG_H__
-#define __NW_LOG_H__
-
-#include <libgen.h>
-
-#include "NwTypes.h"
-
-/**
- * @file NwLog.h
- * @brief This header file contains global shared logging definitions.
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*---------------------------------------------------------------------------
- * Log Level Definitions
- *--------------------------------------------------------------------------*/
-
-#define NW_LOG_LEVEL_EMER (0) /**< system is unusable */
-#define NW_LOG_LEVEL_ALER (1) /**< action must be taken immediately*/
-#define NW_LOG_LEVEL_CRIT (2) /**< critical conditions */
-#define NW_LOG_LEVEL_ERRO (3) /**< error conditions */
-#define NW_LOG_LEVEL_WARN (4) /**< warning conditions */
-#define NW_LOG_LEVEL_NOTI (5) /**< normal but signification condition */
-#define NW_LOG_LEVEL_INFO (6) /**< informational */
-#define NW_LOG_LEVEL_DEBG (7) /**< debug-level messages */
-
-// static
-// NwCharT* gLogLevelStr[] = {"EMER", "ALER", "CRIT", "ERRO", "WARN", "NOTI", "INFO", "DEBG"};
-
-/*---------------------------------------------------------------------------
- * IPv4 logging macros
- *--------------------------------------------------------------------------*/
-#define NW_IPV4_ADDR "%u.%u.%u.%u"
-#define NW_IPV4_ADDR_FORMAT(__addr) (uint8_t)((__addr) & 0x000000ff), \
- (uint8_t)(((__addr) & 0x0000ff00) >> 8 ), \
- (uint8_t)(((__addr) & 0x00ff0000) >> 16), \
- (uint8_t)(((__addr) & 0xff000000) >> 24)
-
-#define NW_IPV4_ADDR_FORMATP(__paddr) (uint8_t)(*((uint8_t*)(__paddr)) & 0x000000ff), \
- (uint8_t)(*((uint8_t*)(__paddr + 1)) & 0x000000ff), \
- (uint8_t)(*((uint8_t*)(__paddr + 2)) & 0x000000ff), \
- (uint8_t)(*((uint8_t*)(__paddr + 3)) & 0x000000ff)
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NW_LOG_H__ */
-
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/shared/NwTypes.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwTypes.h
deleted file mode 100644
index aae5c8a95bf6d539ee95297fb386e023e01f3d81..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/shared/NwTypes.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 c *
- * G P R S T u n n e l i n g P r o t o c o l v 2 c S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-
-#include <stdlib.h>
-#include <stdint.h>
-
-#ifndef __NW_TYPES_H__
-#define __NW_TYPES_H__
-
-/**
- * @file NwTypes.h
- * @brief This header file contains basic type definitions.
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define NW_IN /**< An input argument */
-#define NW_OUT /**< An output argumnet */
-#define NW_INOUT /**< An input and output argument */
-
-#define NW_TRUE (1) /**< Truth value */
-#define NW_FALSE (0) /**< False value */
-
-typedef signed char NwS8T; /**< Signed 1 byte */
-typedef signed short NwS16T; /**< Signed 2 byte */
-typedef signed int NwS32T; /**< Signed 4 byte */
-typedef signed long long NwS64T; /**< Signed 8 byte */
-
-typedef uintptr_t NwPtrT; /**< Use this for generic pointers */
-typedef unsigned int NwHandleT; /**< Use this for generic handles */
-
-typedef char NwBoolT; /**< Use this for booleans */
-
-typedef char NwCharT; /**< Use this for strings */
-
-typedef signed int NwFdT; /**< Use this for file descriptor */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NW_TYPES_H__ */
-
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/shared/NwUtils.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwUtils.h
deleted file mode 100644
index c197ab323e9272f765d05bd6ccae4742a2a2aab2..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/shared/NwUtils.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 c *
- * G P R S T u n n e l i n g P r o t o c o l v 2 c S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-#include <assert.h>
-
-#ifndef __NW_UTILS_H__
-#define __NW_UTILS_H__
-
-
-/**
- * @file NwUtils.h
- * @brief This header file contains utility macro and function definitions.
-*/
-
-#define NW_ASSERT assert /**< Assertion */
-
-#define NW_CHK_NULL_PTR(_ptr) NW_ASSERT(_ptr != NULL) /**< Null pointer check */
-
-#define NW_HTONS(x) ( ( ((x) & 0xff00) >> 8 ) | ( ((x) & 0x00ff) << 8 ) )
-
-#define NW_HTONL(x) ( ( ((x) & 0xff000000) >> 24 ) | ( ( (x) & 0x00ff0000 ) >> 8 ) | \
- ( ( (x) & 0x0000ff00 ) << 8 ) | ( ( (x) & 0x000000ff) << 24 ) )
-
-#define NW_HTONLL(x) ( \
- ( ( ((uint64_t)x) & 0xff00000000000000ULL ) >> 56 ) | ( ( ((uint64_t)x) & 0x00ff000000000000ULL ) >> 40 ) | \
- ( ( ((uint64_t)x) & 0x0000ff0000000000ULL ) >> 24 ) | ( ( ((uint64_t)x) & 0x000000ff00000000ULL ) >> 8 ) | \
- ( ( ((uint64_t)x) & 0x000000000000ff00ULL ) << 40 ) | ( ( ((uint64_t)x) & 0x00000000000000ffULL ) << 56 ) | \
- ( ( ((uint64_t)x) & 0x0000000000ff0000ULL ) << 24 ) | ( ( ((uint64_t)x) & 0x00000000ff000000ULL ) << 8 ) \
- )
-
-#define NW_NTOHS NW_HTONS
-#define NW_NTOHL NW_HTONL
-#define NW_NTOHLL NW_HTONLL
-
-
-#endif /* __NW_UTILS_H__ */
-
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c b/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
deleted file mode 100644
index 0d962cad7d5d1b11450939a87a67d3c3391f5f1b..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
+++ /dev/null
@@ -1,1025 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 u *
- * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "NwTypes.h"
-#include "NwUtils.h"
-#include "NwGtpv1uError.h"
-#include "NwGtpv1uPrivate.h"
-#include "NwGtpv1uTunnelEndPoint.h"
-#include "NwGtpv1uTrxn.h"
-#include "NwGtpv1u.h"
-#include "NwGtpv1uIe.h"
-#include "NwGtpv1uLog.h"
-
-#include "assertions.h"
-#include "intertask_interface.h"
-#include "msc.h"
-
-#include "gtpv1u.h"
-#if defined(ENB_MODE)
-#include "common/utils/LOG/log.h"
-#include "common/utils/LOG/vcd_signal_dumper.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//#define LOG_GTPU 1
-/*--------------------------------------------------------------------------*
- * P R I V A T E F U N C T I O N S *
- *--------------------------------------------------------------------------*/
-
-#define NW_GTPV1U_EPC_SPECIFIC_HEADER_SIZE (12) /**< Size of GTPv1u EPC specific header */
-#define NW_GTPV1U_EPC_MIN_HEADER_SIZE (8)
-
-
-void
-nwGtpv1uDisplayBanner(void)
-{
- printf(" *----------------------------------------------------------------------------*\n");
- printf(" * *\n");
- printf(" * n w - g t p v 2 u *\n");
- printf(" * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *\n");
- printf(" * *\n");
- printf(" * *\n");
- printf(" * Copyright (c) 2010-2011 Amit Chawre *\n");
- printf(" * All rights reserved. *\n");
- printf(" * *\n");
- printf(" * Redistribution and use in source and binary forms, with or without *\n");
- printf(" * modification, are permitted provided that the following conditions *\n");
- printf(" * are met: *\n");
- printf(" * *\n");
- printf(" * 1. Redistributions of source code must retain the above copyright *\n");
- printf(" * notice, this list of conditions and the following disclaimer. *\n");
- printf(" * 2. Redistributions in binary form must reproduce the above copyright *\n");
- printf(" * notice, this list of conditions and the following disclaimer in the *\n");
- printf(" * documentation and/or other materials provided with the distribution. *\n");
- printf(" * 3. The name of the author may not be used to endorse or promote products *\n");
- printf(" * derived from this software without specific prior written permission. *\n");
- printf(" * *\n");
- printf(" * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *\n");
- printf(" * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *\n");
- printf(" * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *\n");
- printf(" * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *\n");
- printf(" * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *\n");
- printf(" * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *\n");
- printf(" * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *\n");
- printf(" * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *\n");
- printf(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *\n");
- printf(" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *\n");
- printf(" *----------------------------------------------------------------------------*\n\n");
-
-}
-/*---------------------------------------------------------------------------
- * RBTree Search Functions
- *--------------------------------------------------------------------------*/
-
-static inline NwS32T
-nwGtpv1uCompareTeid(struct NwGtpv1uTunnelEndPoint *a,
- struct NwGtpv1uTunnelEndPoint *b);
-
-static inline NwS32T
-nwGtpv1uCompareSeqNum(struct NwGtpv1uTrxn *a, struct NwGtpv1uTrxn *b);
-
-RB_PROTOTYPE(NwGtpv1uOutstandingTxSeqNumTrxnMap, NwGtpv1uTrxn,
- outstandingTxSeqNumMapRbtNode, nwGtpv1uCompareSeqNum)
-RB_PROTOTYPE(NwGtpv1uOutstandingRxSeqNumTrxnMap, NwGtpv1uTrxn,
- outstandingRxSeqNumMapRbtNode, nwGtpv1uCompareSeqNum)
-RB_PROTOTYPE(NwGtpv1uTunnelEndPointTMap, NwGtpv1uTunnelEndPoint,
- sessionMapRbtNode, nwGtpv1uCompareTeid)
-RB_PROTOTYPE(NwGtpv1uTunnelEndPointIdentifierMap, NwGtpv1uTunnelEndPoint,
- sessionMapRbtNode, nwGtpv1uCompareTeid)
-
-RB_GENERATE(NwGtpv1uOutstandingTxSeqNumTrxnMap, NwGtpv1uTrxn,
- outstandingTxSeqNumMapRbtNode, nwGtpv1uCompareSeqNum)
-RB_GENERATE(NwGtpv1uOutstandingRxSeqNumTrxnMap, NwGtpv1uTrxn,
- outstandingRxSeqNumMapRbtNode, nwGtpv1uCompareSeqNum)
-RB_GENERATE(NwGtpv1uTunnelEndPointTMap, NwGtpv1uTunnelEndPoint,
- sessionMapRbtNode, nwGtpv1uCompareTeid)
-RB_GENERATE(NwGtpv1uTunnelEndPointIdentifierMap, NwGtpv1uTunnelEndPoint,
- sessionMapRbtNode, nwGtpv1uCompareTeid)
-
-/**
- Comparator funtion for comparing two sessions.
-
- @param[in] a: Pointer to session a.
- @param[in] b: Pointer to session b.
- @return An integer greater than, equal to or less than zero according to whether the
- object pointed to by a is greater than, equal to or less than the object pointed to by b.
- */
-
-static inline NwS32T
-nwGtpv1uCompareTeid(struct NwGtpv1uTunnelEndPoint *a,
- struct NwGtpv1uTunnelEndPoint *b)
-{
- if(a->teid > b->teid) {
- return 1;
- }
-
- if(a->teid < b->teid) {
- return -1;
- }
-
- return 0;
-}
-
-/**
- Comparator funtion for comparing two sequence number transactions.
-
- @param[in] a: Pointer to session a.
- @param[in] b: Pointer to session b.
- @return An integer greater than, equal to or less than zero according to whether the
- object pointed to by a is greater than, equal to or less than the object pointed to by b.
- */
-
-static inline NwS32T
-nwGtpv1uCompareSeqNum(struct NwGtpv1uTrxn *a, struct NwGtpv1uTrxn *b)
-{
- if(a->seqNum > b->seqNum) {
- return 1;
- }
-
- if(a->seqNum < b->seqNum) {
- return -1;
- }
-
- if(a->peerIp > b->peerIp) {
- return 1;
- }
-
- if(a->peerIp < b->peerIp) {
- return -1;
- }
-
- return 0;
-}
-
-/**
- Create and Send GTPU message.
-
- @param[in] thiz: Stack handle
- @return NW_GTPV1U_OK on success.
- */
-
-static NwGtpv1uRcT
-nwGtpv1uCreateAndSendMsg( NwGtpv1uStackT *thiz, uint32_t peerIp, uint16_t peerPort,
- NwGtpv1uMsgT *pMsg)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- uint8_t *msgHdr;
-
- NW_ASSERT(thiz);
- NW_ASSERT(pMsg);
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_ENTER(thiz);
-#endif
-
- msgHdr = &pMsg->msgBuf[pMsg->msgBufOffset];
- NW_ASSERT(msgHdr != NULL);
-
- *(msgHdr++) = (pMsg->version << 5) |
- (pMsg->protocolType << 4) |
- (pMsg->extHdrFlag << 2) |
- (pMsg->seqNumFlag << 1) |
- (pMsg->npduNumFlag);
-
- *(msgHdr++) = (pMsg->msgType);
- *((uint16_t *) msgHdr) = htons(pMsg->msgLen);
- msgHdr += 2;
-
- *((uint32_t *) msgHdr) = htonl(pMsg->teid);
- msgHdr += 4;
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- GTPU_DEBUG("nwGtpv1uCreateAndSendMsg to teid %u length %d offset %d\n",
- pMsg->teid,
- pMsg->msgLen,
- pMsg->msgBufOffset);
-#endif
-
- if(pMsg->seqNumFlag || pMsg->extHdrFlag || pMsg->npduNumFlag) {
- *((uint16_t *) msgHdr) = (pMsg->seqNumFlag ? htons(pMsg->seqNum) : 0x0000);
- msgHdr += 2;
-
- *((uint8_t *) msgHdr) = (pMsg->npduNumFlag ? htons(pMsg->npduNum) : 0x00);
- msgHdr++;
-
- *((uint8_t *) msgHdr) = (pMsg->extHdrFlag ? htons(pMsg->nextExtHdrType) : 0x00);
- msgHdr++;
- }
-
- rc = thiz->udp.udpDataReqCallback(thiz->udp.hUdp,
- pMsg->msgBuf,
- pMsg->msgBufLen,
- pMsg->msgBufOffset,
- peerIp,
- peerPort);
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_LEAVE(thiz);
-#endif
- return rc;
-}
-
-/**
- * Send GTPv1u Message Indication to ULP entity.
- *
- * @param[in] hGtpuStackHandle : Stack handle
- * @return NW_GTPV1U_OK on success.
- */
-
-static NwGtpv1uRcT
-nwGtpv1uSendUlpMessageIndication( NW_IN NwGtpv1uStackT *thiz,
- NW_IN uint32_t hUlpTrxn,
- NW_IN uint32_t apiType,
- NW_IN uint32_t msgType,
- NW_IN uint32_t peerIp,
- NW_IN uint16_t peerPort,
- NW_IN uint8_t *pMsgBuf,
- NW_IN uint16_t msgLength)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uUlpApiT ulpApi;
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_ENTER(thiz);
-#endif
-
- ulpApi.apiType = apiType;
- ulpApi.apiInfo.recvMsgInfo.msgType = msgType;
- ulpApi.apiInfo.recvMsgInfo.hUlpTrxn = hUlpTrxn;
- ulpApi.apiInfo.recvMsgInfo.peerIp = peerIp;
- ulpApi.apiInfo.recvMsgInfo.peerPort = peerPort;
-
- if(pMsgBuf && msgLength) {
- rc = nwGtpv1uMsgFromBufferNew((NwGtpv1uStackHandleT)thiz, pMsgBuf, msgLength,
- &(ulpApi.apiInfo.recvMsgInfo.hMsg));
- NW_ASSERT(rc == NW_GTPV1U_OK);
- }
-
- rc = thiz->ulp.ulpReqCallback(thiz->ulp.hUlp, &ulpApi);
- NW_ASSERT(rc == NW_GTPV1U_OK);
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_LEAVE(thiz);
-#endif
-
- return rc;
-}
-
-NwGtpv1uRcT
-nwGtpv1uPeerRspTimeout(void *arg)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- NwGtpv1uTrxnT *thiz;
- NwGtpv1uTimeoutInfoT *timeoutInfo = arg;
-
- GTPU_WARNING( "Retransmission timer expired\n");
-
- thiz = ((NwGtpv1uTrxnT *)timeoutInfo->timeoutArg);
- rc = thiz->pStack->udp.udpDataReqCallback(thiz->pStack->udp.hUdp,
- thiz->pMsg->msgBuf,
- thiz->pMsg->msgLen,
- thiz->pMsg->msgBufOffset,
- thiz->peerIp,
- thiz->peerPort);
-
- if(thiz->maxRetries) {
- rc = thiz->pStack->tmrMgr.tmrStartCallback(thiz->pStack->tmrMgr.tmrMgrHandle,
- 5, 0, NW_GTPV1U_TMR_TYPE_ONE_SHOT, (void *)timeoutInfo, &thiz->hRspTmr);
- thiz->maxRetries--;
- } else {
- /* Inform session layer about path fialure */
- GTPU_WARNING("Max retries over!\n");
- }
-
- return rc;
-}
-
-/*---------------------------------------------------------------------------
- * ULP API Processing Functions
- *--------------------------------------------------------------------------*/
-
-/**
- Process NW_GTPV1U_ULP_API_CREATE_TUNNEL_ENDPOINT Request from ULP entity.
-
- @param[in] hGtpuStackHandle : Stack handle
- @param[in] pUlpReq : Pointer to Ulp Req.
- @return NW_GTPV1U_OK on success.
- */
-
-static NwGtpv1uRcT
-NwGtpv1uCreateTunnelEndPoint( NW_IN NwGtpv1uStackT *thiz,
- NW_IN uint32_t teid,
- NW_IN NwGtpv1uUlpSessionHandleT hUlpSession,
- NW_OUT NwGtpv1uStackSessionHandleT *phStackSession )
-{
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- NwGtpv1uTunnelEndPointT *pTunnelEndPoint;
- NwGtpv1uTunnelEndPointT *pCollision;
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_ENTER(thiz);
-#endif
- pTunnelEndPoint = nwGtpTunnelEndPointNew(thiz);
-
- if(pTunnelEndPoint) {
-
- pTunnelEndPoint->teid = teid;
- pTunnelEndPoint->pStack = thiz;
- pTunnelEndPoint->hUlpSession = hUlpSession;
-
- pCollision = RB_INSERT(NwGtpv1uTunnelEndPointIdentifierMap, &(thiz->teidMap),
- pTunnelEndPoint);
-
- if(pCollision) {
- GTPU_ERROR("Tunnel end-point cannot be created for teid 0x%x. "
- "Tunnel already exists", teid);
- rc = nwGtpTunnelEndPointDestroy(thiz, pTunnelEndPoint);
- NW_ASSERT(rc == NW_GTPV1U_OK);
- *phStackSession = (NwGtpv1uStackSessionHandleT) NULL;
- NW_ASSERT(0);
- rc = NW_GTPV1U_FAILURE;
- } else {
- *phStackSession = (NwGtpv1uStackSessionHandleT) pTunnelEndPoint;
- pTunnelEndPoint = RB_FIND(NwGtpv1uTunnelEndPointIdentifierMap,
- &(thiz->teidMap), pTunnelEndPoint);
- //NW_ASSERT(pTunnelEndPoint);
- if (!pTunnelEndPoint) {
- GTPU_ERROR("Tunnel end-point cannot be NULL");
- rc = NW_GTPV1U_FAILURE;
- } else {
- GTPU_DEBUG("Tunnel end-point 0x%p creation successful for teid 0x%x %u(dec)",
- pTunnelEndPoint, (unsigned int)teid, (unsigned int)teid);
- }
- }
-
- } else {
- *phStackSession = (NwGtpv1uStackSessionHandleT) NULL;
- rc = NW_GTPV1U_FAILURE;
- }
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_LEAVE(thiz);
-#endif
- return rc;
-}
-
-/**
- Process NW_GTPV1U_ULP_API_DESTROY_TUNNEL_ENDPOINT Request from ULP entity.
-
- @param[in] hGtpuStackHandle : Stack handle
- @param[in] pUlpReq : Pointer to Ulp Req.
- @return NW_GTPV1U_OK on success.
- */
-
-static NwGtpv1uRcT
-nwGtpv1uDestroyTunnelEndPoint( NwGtpv1uStackT *thiz,
- NW_IN NwGtpv1uUlpApiT *pUlpReq)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- NwGtpv1uTunnelEndPointT *pRemovedTeid;
-
- if(pUlpReq->apiInfo.destroyTunnelEndPointInfo.hStackSessionHandle) {
- GTPU_DEBUG( "Destroying Tunnel end-point '%lx'",
- pUlpReq->apiInfo.destroyTunnelEndPointInfo.hStackSessionHandle);
- pRemovedTeid = RB_REMOVE(NwGtpv1uTunnelEndPointIdentifierMap, &(thiz->teidMap),
- (NwGtpv1uTunnelEndPointT *)(
- pUlpReq->apiInfo.destroyTunnelEndPointInfo.hStackSessionHandle));
-
- NW_ASSERT(pRemovedTeid == (NwGtpv1uTunnelEndPointT *)(
- pUlpReq->apiInfo.destroyTunnelEndPointInfo.hStackSessionHandle));
-
- rc = nwGtpTunnelEndPointDestroy(thiz,
- (NwGtpv1uTunnelEndPointT *)
- pUlpReq->apiInfo.destroyTunnelEndPointInfo.hStackSessionHandle);
- } else {
- GTPU_WARNING("Non-existent Tunnel end-point handle '%lx'",
- pUlpReq->apiInfo.destroyTunnelEndPointInfo.hStackSessionHandle);
- }
-
- return rc;
-}
-
-/**
- Process NW_GTPV1U_ULP_API_INITIAL_REQ Request from ULP entity.
-
- @param[in] hGtpuStackHandle : Stack handle
- @param[in] pUlpReq : Pointer to Ulp Req.
- @return NW_GTPV1U_OK on success.
- */
-
-static NwGtpv1uRcT
-nwGtpv1uInitialReq( NW_IN NwGtpv1uStackT *thiz, NW_IN NwGtpv1uUlpApiT *pUlpReq)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uTrxnT *pTrxn;
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_ENTER(thiz);
-#endif
- /* Create New Transaction */
- rc = nwGtpv1uTrxnNew(thiz, &pTrxn);
-
- if(pTrxn) {
- rc = nwGtpv1uTrxnCreateAndSendMsg(thiz,
- pTrxn,
- pUlpReq->apiInfo.initialReqInfo.peerIp,
- pUlpReq->apiInfo.initialReqInfo.peerPort,
- (NwGtpv1uMsgT *) pUlpReq->hMsg);
-
- if(rc == NW_GTPV1U_OK) {
- /* Insert into search tree */
- RB_INSERT(NwGtpv1uOutstandingTxSeqNumTrxnMap, &(thiz->outstandingTxSeqNumMap),
- pTrxn);
- } else {
- rc = nwGtpv1uTrxnDelete(&pTrxn);
- NW_ASSERT(rc == NW_GTPV1U_OK);
- }
- }
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_LEAVE(thiz);
-#endif
- return rc;
-}
-
-/**
- Process NW_GTPV1U_ULP_API_SEND_TPDU Request from ULP entity.
-
- @param[in] thiz: Stack handle
- @param[in] pUlpReq : Pointer to Ulp Req.
- @return NW_GTPV1U_OK on success.
- */
-
-static NwGtpv1uRcT
-nwGtpv1uSendto( NwGtpv1uStackT *thiz, NW_IN NwGtpv1uUlpApiT *pUlpReq)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
-
- NW_ASSERT(thiz);
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_ENTER(thiz);
-#endif
-
- (void) nwGtpv1uMsgSetTeid(pUlpReq->apiInfo.sendtoInfo.hMsg,
- pUlpReq->apiInfo.sendtoInfo.teid);
-
- rc = nwGtpv1uCreateAndSendMsg(thiz,
- pUlpReq->apiInfo.sendtoInfo.ipAddr,
- 2152,
- (NwGtpv1uMsgT *) (NwGtpv1uMsgT *) pUlpReq->apiInfo.sendtoInfo.hMsg);
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_LEAVE(thiz);
-#endif
- return rc;
-}
-
-/**
- Process GPDU from UDP entity.
-
- @param[in] thiz: Stack handle
- @param[in] pUlpReq : Pointer to Ulp Req.
- @return NW_GTPV1U_OK on success.
- */
-
-static NwGtpv1uRcT
-nwGtpv1uProcessGpdu( NwGtpv1uStackT *thiz,
- NW_IN uint8_t *gpdu,
- NW_IN uint32_t gpduLen,
- NW_IN uint32_t peerIp)
-
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uMsgHeaderT *msgHdr = NULL;
- NwGtpv1uTunnelEndPointT *pTunnelEndPoint = NULL;
- NwGtpv1uTunnelEndPointT tunnelEndPointKey;
- // uint16_t hdr_len = 0;
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_ENTER(thiz);
-#endif
-
- // no buffer offset
- msgHdr = (NwGtpv1uMsgHeaderT *) gpdu;
-
- tunnelEndPointKey.teid = ntohl(msgHdr->teid);
-
- pTunnelEndPoint = RB_FIND(NwGtpv1uTunnelEndPointIdentifierMap,
- &(thiz->teidMap), &tunnelEndPointKey);
-
- if(pTunnelEndPoint) {
- NwGtpv1uMsgHandleT hMsg;
-
- rc = nwGtpv1uMsgFromBufferNew( (NwGtpv1uStackHandleT)thiz,
- (uint8_t *)gpdu,
- gpduLen,
- &hMsg);
-
- /*
- uint8_t* msgBuf;
- uint32_t msgBufLen;
- uint32_t msgBufOffset;
- */
- if(NW_GTPV1U_OK == rc) {
- NwGtpv1uMsgT *pMsg = (NwGtpv1uMsgT *) hMsg;
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- GTPU_DEBUG("Received T-PDU over tunnel end-point '%x' of size %u (%u) (decapsulated %u)from "NW_IPV4_ADDR"\n",
- ntohl(msgHdr->teid), gpduLen, pMsg->msgLen, pMsg->msgBufLen, NW_IPV4_ADDR_FORMAT((peerIp)));
-#endif
- MSC_LOG_RX_MESSAGE(
- (thiz->stackType == GTPU_STACK_ENB) ? MSC_GTPU_ENB:MSC_GTPU_SGW,
- (thiz->stackType == GTPU_STACK_ENB) ? MSC_GTPU_SGW:MSC_GTPU_ENB,
- NULL,
- 0,
- " G-PDU ltid %u size %u",
- tunnelEndPointKey.teid,
- gpduLen);
-
- rc = nwGtpSessionSendMsgApiToUlpEntity(pTunnelEndPoint, pMsg);
- }
- } else {
- MSC_LOG_RX_DISCARDED_MESSAGE(
- (thiz->stackType == GTPU_STACK_ENB) ? MSC_GTPU_ENB:MSC_GTPU_SGW,
- (thiz->stackType == GTPU_STACK_ENB) ? MSC_GTPU_SGW:MSC_GTPU_ENB,
- NULL,
- 0,
- " G-PDU ltid %u size %u",
- tunnelEndPointKey.teid,
- gpduLen);
- GTPU_DEBUG("Received T-PDU over non-existent tunnel end-point '%x' from "NW_IPV4_ADDR"\n",
- ntohl(msgHdr->teid), NW_IPV4_ADDR_FORMAT((peerIp)));
- }
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_LEAVE(thiz);
-#endif
- return rc;
-}
-
-/**
- Handle Echo Request from Peer Entity.
-
- @param[in] thiz : Stack context
- @return NW_GTPV1U_OK on success.
- */
-
-static NwGtpv1uRcT
-nwGtpv1uHandleEchoReq(NW_IN NwGtpv1uStackT *thiz,
- NW_IN uint8_t *msgBuf,
- NW_IN uint32_t msgBufLen,
- NW_IN uint16_t peerPort,
- NW_IN uint32_t peerIp)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- uint16_t seqNum = 0;
- NwGtpv1uMsgHandleT hMsg = 0;
- int bufLen = 0;
-
- seqNum = ntohs(*(uint16_t *) (msgBuf + (((*msgBuf) & 0x02) ? 8 : 4)));
-
- MSC_LOG_RX_MESSAGE(
- (thiz->stackType == GTPU_STACK_ENB) ? MSC_GTPU_ENB:MSC_GTPU_SGW,
- (thiz->stackType == GTPU_STACK_ENB) ? MSC_GTPU_SGW:MSC_GTPU_ENB,
- NULL,
- 0,
- MSC_AS_TIME_FMT" ECHO-REQ seq %u size %u",
- 0,0,seqNum, msgBufLen);
- /* Send Echo Response */
-
- rc = nwGtpv1uMsgNew( (NwGtpv1uStackHandleT)thiz,
- NW_TRUE, /* SeqNum flag */
- NW_FALSE,
- NW_FALSE,
- NW_GTP_ECHO_RSP, /* Msg Type */
- 0x00000000U, /* TEID */
- seqNum, /* Seq Number */
- 0,
- 0,
- (&hMsg));
-
- bufLen = sizeof(NwGtpv1uIeTv1T)+ ((NwGtpv1uMsgT*)hMsg)->msgLen;
-
-//#warning CROUX DIRTY +16, TO BE FIXED!!!
- /* the +16 is there because by analyzing memory allocation with some external
- * tool, I saw that there were 6 bytes accessed after bufLen in nwGtpv1uCreateAndSendMsg
- * the value "16" has been chosen arbitrarily, just bigger than 6
- */
- ((NwGtpv1uMsgT*)hMsg)->msgBuf = itti_malloc(
- TASK_GTPV1_U,
- TASK_UDP,
- bufLen + 16 /* CROUX - dirty +16, to be fixed! */);
- ((NwGtpv1uMsgT*)hMsg)->msgBufLen = bufLen;
- NW_ASSERT(NW_GTPV1U_OK == rc);
-
- /*
- * The Restart Counter value in the Recovery information element shall
- * not be used, i.e. it shall be set to zero by the sender and shall be
- * ignored by the receiver.
- */
- rc = nwGtpv1uMsgAddIeTV1(hMsg, NW_GTPV1U_IE_RECOVERY, 0x00);
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- GTPU_INFO("Sending NW_GTP_ECHO_RSP message to %x:%x with seq %u\n",
- peerIp,
- peerPort,
- seqNum);
-#endif
- MSC_LOG_TX_MESSAGE(
- (thiz->stackType == GTPU_STACK_ENB) ? MSC_GTPU_ENB:MSC_GTPU_SGW,
- (thiz->stackType == GTPU_STACK_ENB) ? MSC_GTPU_SGW:MSC_GTPU_ENB,
- NULL,
- 0,
- MSC_AS_TIME_FMT" ECHO-RSP seq %u",
- 0,0,seqNum);
- rc = nwGtpv1uCreateAndSendMsg(
- thiz,
- peerIp,
- peerPort,
- (NwGtpv1uMsgT *) hMsg);
-
- rc = nwGtpv1uMsgDelete((NwGtpv1uStackHandleT)thiz, hMsg);
- NW_ASSERT(NW_GTPV1U_OK == rc);
-
- return rc;
-}
-
-/*--------------------------------------------------------------------------*
- * P U B L I C F U N C T I O N S *
- *--------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------
- * Constructor
- *--------------------------------------------------------------------------*/
-
-NwGtpv1uRcT
-nwGtpv1uInitialize( NW_INOUT NwGtpv1uStackHandleT *hGtpuStackHandle, uint32_t stackType)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uStackT *thiz;
-
- thiz = (NwGtpv1uStackT *) malloc( sizeof(NwGtpv1uStackT));
-
- if(thiz) {
- memset(thiz, 0, sizeof(NwGtpv1uStackT));
- thiz->id = (NwPtrT)thiz;
- thiz->stackType = stackType;
- thiz->seq = (uint16_t) ((uintptr_t)thiz) ; // FIXME interesting casts... don't know what this is good for...
- RB_INIT(&(thiz->outstandingTxSeqNumMap));
- RB_INIT(&(thiz->outstandingRxSeqNumMap));
- RB_INIT(&(thiz->sessionMap));
- RB_INIT(&(thiz->teidMap));
-
- if (0 == 1) {
- nwGtpv1uDisplayBanner();
- }
-
- rc = NW_GTPV1U_OK;
- } else {
- rc = NW_GTPV1U_FAILURE;
- }
-
-
- *hGtpuStackHandle = (NwGtpv1uStackHandleT) thiz;
- return rc;
-}
-
-
-/*---------------------------------------------------------------------------
- * Destructor
- *--------------------------------------------------------------------------*/
-
-NwGtpv1uRcT
-nwGtpv1uFinalize( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
-
- if(hGtpuStackHandle) {
- free((void *)hGtpuStackHandle);
- rc = NW_GTPV1U_OK;
- } else {
- rc = NW_GTPV1U_FAILURE;
- }
-
- return rc;
-}
-
-
-/*---------------------------------------------------------------------------
- * Configuration Get/Set
- *--------------------------------------------------------------------------*/
-
-NwGtpv1uRcT
-nwGtpv1uSetUlpEntity( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN NwGtpv1uUlpEntityT *pUlpEntity)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uStackT *thiz = (NwGtpv1uStackT *) hGtpuStackHandle;
-
- if(pUlpEntity) {
- thiz->ulp = *(pUlpEntity);
- rc = NW_GTPV1U_OK;
- } else {
- rc = NW_GTPV1U_FAILURE;
- }
-
- return rc;
-}
-
-
-NwGtpv1uRcT
-nwGtpv1uSetUdpEntity( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN NwGtpv1uUdpEntityT *pUdpEntity)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uStackT *thiz = (NwGtpv1uStackT *) hGtpuStackHandle;
-
- if(pUdpEntity) {
- thiz->udp = *(pUdpEntity);
- rc = NW_GTPV1U_OK;
- } else {
- rc = NW_GTPV1U_FAILURE;
- }
-
- return rc;
-}
-
-NwGtpv1uRcT
-nwGtpv1uSetMemMgrEntity( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN NwGtpv1uMemMgrEntityT *pMemMgrEntity)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uStackT *thiz = (NwGtpv1uStackT *) hGtpuStackHandle;
-
- if(pMemMgrEntity) {
- thiz->memMgr = *(pMemMgrEntity);
- rc = NW_GTPV1U_OK;
- } else {
- rc = NW_GTPV1U_FAILURE;
- }
-
- return rc;
-}
-
-
-NwGtpv1uRcT
-nwGtpv1uSetTimerMgrEntity( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN NwGtpv1uTimerMgrEntityT *pTmrMgrEntity)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uStackT *thiz = (NwGtpv1uStackT *) hGtpuStackHandle;
-
- if(pTmrMgrEntity) {
- thiz->tmrMgr = *(pTmrMgrEntity);
- rc = NW_GTPV1U_OK;
- } else {
- rc = NW_GTPV1U_FAILURE;
- }
-
- return rc;
-}
-
-
-NwGtpv1uRcT
-nwGtpv1uSetLogMgrEntity( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN NwGtpv1uLogMgrEntityT *pLogMgrEntity)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uStackT *thiz = (NwGtpv1uStackT *) hGtpuStackHandle;
-
- if(pLogMgrEntity) {
- thiz->logMgr = *(pLogMgrEntity);
- rc = NW_GTPV1U_OK;
- } else {
- rc = NW_GTPV1U_FAILURE;
- }
-
- return rc;
-}
-
-NwGtpv1uRcT
-nwGtpv1uSetLogLevel( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN uint32_t logLevel)
-{
- NwGtpv1uStackT *thiz = (NwGtpv1uStackT *) hGtpuStackHandle;
- thiz->logLevel = logLevel;
- return NW_GTPV1U_OK;
-}
-
-/*---------------------------------------------------------------------------
- * Process Request from Udp Layer
- *--------------------------------------------------------------------------*/
-
-NwGtpv1uRcT
-nwGtpv1uProcessUdpReq( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN uint8_t *udpData,
- NW_IN uint32_t udpDataLen,
- NW_IN uint16_t peerPort,
- NW_IN uint32_t peerIp)
-{
- NwGtpv1uRcT ret = NW_GTPV1U_FAILURE;
- NwGtpv1uStackT *thiz;
- uint16_t msgType;
-
-#if defined(ENB_MODE)
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_PROCESS_UDP_REQ, VCD_FUNCTION_IN);
-#endif
- thiz = (NwGtpv1uStackT *) hGtpuStackHandle;
-
- NW_ASSERT(thiz);
-
- msgType = *((uint8_t *)(udpData + 1));
-
- switch(msgType) {
- case NW_GTP_ECHO_REQ:
- GTPU_DEBUG("NW_GTP_ECHO_REQ\n");
- ret = nwGtpv1uHandleEchoReq( thiz, udpData, udpDataLen, peerPort, peerIp);
- break;
-
- case NW_GTP_ERROR_INDICATION:
- GTPU_DEBUG("NW_GTP_ERROR_INDICATION\n");
- ret = nwGtpv1uSendUlpMessageIndication( thiz,
- 0,
- NW_GTPV1U_ULP_API_RECV_MSG,
- msgType,
- peerIp,
- peerPort,
- udpData,
- udpDataLen);
-
- NW_ASSERT(ret == NW_GTPV1U_OK);
- break;
-
- case NW_GTP_ECHO_RSP:
- GTPU_DEBUG("NW_GTP_ECHO_RSP\n");
- ret = NW_GTPV1U_OK;
- break;
-
- case NW_GTP_GPDU:
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- GTPU_DEBUG("NW_GTP_GPDU: DATA COMING FROM UDP\n");
-#endif
- ret = nwGtpv1uProcessGpdu(thiz, udpData, udpDataLen, peerIp);
- break;
-
- case NW_GTP_END_MARKER:
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- for(int i =1; i<= udpDataLen; i++){
- printf("%02x ", (uint8_t)udpData[i-1]);
- if(i % 20 == 0)printf("\n");
- }
-#endif
- GTPU_INFO("NW_GTP_END_MARKER\n");
- ret = nwGtpv1uProcessGpdu(thiz, udpData, udpDataLen, peerIp);
- break;
-
- default:
- ret = NW_GTPV1U_FAILURE;
- NW_ASSERT(0);
- break;
- }
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_LEAVE(thiz);
-#endif
-#if defined(ENB_MODE)
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GTPV1U_PROCESS_UDP_REQ, VCD_FUNCTION_OUT);
-#endif
- return ret;
-}
-
-
-/*---------------------------------------------------------------------------
- * Process Request from Upper Layer
- *--------------------------------------------------------------------------*/
-
-NwGtpv1uRcT
-nwGtpv1uProcessUlpReq( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN NwGtpv1uUlpApiT *pUlpReq)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uStackT *thiz = (NwGtpv1uStackT *) hGtpuStackHandle;
-
- NW_ASSERT(thiz);
- NW_ASSERT(pUlpReq != NULL);
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_ENTER(thiz);
-#endif
-
- switch(pUlpReq->apiType) {
- case NW_GTPV1U_ULP_API_CREATE_TUNNEL_ENDPOINT: {
- GTPU_DEBUG("Received NW_GTPV1U_ULP_API_CREATE_TUNNEL_ENDPOINT from ulp\n");
- rc = NwGtpv1uCreateTunnelEndPoint(thiz,
- pUlpReq->apiInfo.createTunnelEndPointInfo.teid,
- pUlpReq->apiInfo.createTunnelEndPointInfo.hUlpSession,
- &(pUlpReq->apiInfo.createTunnelEndPointInfo.hStackSession));
- }
- break;
-
- case NW_GTPV1U_ULP_API_DESTROY_TUNNEL_ENDPOINT: {
- GTPU_DEBUG("Received destroy session req from ulp\n");
- rc = nwGtpv1uDestroyTunnelEndPoint(thiz, pUlpReq);
- }
- break;
-
- case NW_GTPV1U_ULP_API_INITIAL_REQ: {
- GTPU_DEBUG("Received initial req from ulp\n");
- rc = nwGtpv1uInitialReq(thiz, pUlpReq);
- }
- break;
-
- case NW_GTPV1U_ULP_API_SEND_TPDU: {
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- GTPU_DEBUG("Received send tpdu req from ulp\n");
-#endif
- rc = nwGtpv1uSendto(thiz, pUlpReq);
- }
- break;
-
- default:
- GTPU_DEBUG("Unsupported API received from ulp\n");
- rc = NW_GTPV1U_FAILURE;
- break;
- }
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_LEAVE(thiz);
-#endif
- return rc;
-}
-
-/*---------------------------------------------------------------------------
- * Process Timer timeout Request from Timer Manager
- *--------------------------------------------------------------------------*/
-
-NwGtpv1uRcT
-nwGtpv1uProcessTimeout(void *timeoutInfo)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_FAILURE;
- NwGtpv1uStackT *thiz;
-
- NW_ASSERT(timeoutInfo != NULL);
-
- thiz = (NwGtpv1uStackT *) (((NwGtpv1uTimeoutInfoT *) timeoutInfo)->hStack);
-
- NW_ASSERT(thiz != NULL);
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_ENTER(thiz);
-#endif
- GTPU_DEBUG("Received timeout event from ULP with timeoutInfo 0x%p!\n",
- timeoutInfo);
-
- rc = (((NwGtpv1uTimeoutInfoT *) timeoutInfo)->timeoutCallbackFunc) (timeoutInfo);
-
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- NW_LEAVE(thiz);
-#endif
- return rc;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-/*--------------------------------------------------------------------------*
- * E N D O F F I L E *
- *--------------------------------------------------------------------------*/
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c b/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c
deleted file mode 100644
index 365d6d23a5ff124b2ade204f940534c82aa7eb34..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c
+++ /dev/null
@@ -1,558 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 u *
- * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "NwTypes.h"
-#include "NwLog.h"
-#include "NwUtils.h"
-#include "NwGtpv1uLog.h"
-#include "NwGtpv1u.h"
-#include "NwGtpv1uPrivate.h"
-#include "NwGtpv1uMsg.h"
-#include "assertions.h"
-
-#include "gtpv1u.h"
-#if defined(ENB_MODE)
-#include "common/utils/LOG/log.h"
-#endif
-
-#define NW_GTPV1U_EPC_SPECIFIC_HEADER_SIZE (12) /**< Size of GTPv1u EPC specific header */
-#define NW_GTPV1U_EPC_MIN_HEADER_SIZE (8)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static NwGtpv1uMsgT *gpGtpv1uMsgPool = NULL;
-
-NwGtpv1uRcT
-nwGtpv1uMsgNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN uint8_t seqNumFlag,
- NW_IN uint8_t npduNumFlag,
- NW_IN uint8_t extHdrFlag,
- NW_IN uint8_t msgType,
- NW_IN uint8_t teid,
- NW_IN uint16_t seqNum,
- NW_IN uint8_t npduNum,
- NW_IN uint8_t nextExtHeader,
- NW_OUT NwGtpv1uMsgHandleT *phMsg)
-{
- NwGtpv1uStackT *pStack = (NwGtpv1uStackT *) hGtpuStackHandle;
- NwGtpv1uMsgT *pMsg;
-
- if(gpGtpv1uMsgPool) {
- pMsg = gpGtpv1uMsgPool;
- gpGtpv1uMsgPool = gpGtpv1uMsgPool->next;
- } else {
- NW_GTPV1U_MALLOC(pStack, sizeof(NwGtpv1uMsgT), pMsg, NwGtpv1uMsgT *);
- }
-
-
- if(pMsg) {
- pMsg->version = NW_GTPU_VERSION;
- pMsg->protocolType = NW_GTP_PROTOCOL_TYPE_GTP;
- pMsg->seqNumFlag = seqNumFlag;
- pMsg->npduNumFlag = npduNumFlag;
- pMsg->extHdrFlag = extHdrFlag;
- pMsg->msgType = msgType;
-
- if(seqNumFlag) {
- pMsg->seqNum = seqNum;
- }
-
- if(npduNumFlag) {
- pMsg->npduNum = npduNum;
- }
-
- if(extHdrFlag) {
- pMsg->nextExtHdrType = nextExtHeader;
- }
-
- pMsg->msgLen = ((pMsg->seqNumFlag || pMsg->npduNumFlag
- || pMsg->extHdrFlag) ?
- 4 : 0);
- //NW_GTPV1U_EPC_SPECIFIC_HEADER_SIZE : (NW_GTPV1U_EPC_SPECIFIC_HEADER_SIZE - 4));
-
- pMsg->msgBuf = NULL;
- pMsg->msgBufLen = 0;
- pMsg->msgBufOffset = 0;
- *phMsg = (NwGtpv1uMsgHandleT) pMsg;
- return NW_GTPV1U_OK;
- }
-
- return NW_GTPV1U_FAILURE;
-}
-
-NwGtpv1uRcT
-nwGtpv1uGpduMsgNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN uint32_t teid,
- NW_IN uint8_t seqNumFlag,
- NW_IN uint16_t seqNum,
- NW_IN uint8_t *tpdu,
- NW_IN uint16_t tpduLength,
- NW_IN uint32_t tpduOffset,
- NW_OUT NwGtpv1uMsgHandleT *phMsg)
-{
- NwGtpv1uStackT *pStack = (NwGtpv1uStackT *) hGtpuStackHandle;
- NwGtpv1uMsgT *pMsg;
- //uint32_t header_len = 0;
- uint32_t msgExtraLen = 0;
-
- if(gpGtpv1uMsgPool) {
- pMsg = gpGtpv1uMsgPool;
- gpGtpv1uMsgPool = gpGtpv1uMsgPool->next;
- } else {
- NW_GTPV1U_MALLOC(pStack, sizeof(NwGtpv1uMsgT), pMsg, NwGtpv1uMsgT *);
- }
-
- if(pMsg) {
- msgExtraLen = (((seqNumFlag) || (NW_FALSE) || (NW_FALSE) ) ?
- (NW_GTPV1U_EPC_SPECIFIC_HEADER_SIZE - NW_GTPV1U_EPC_MIN_HEADER_SIZE) : 0);
- AssertFatal((msgExtraLen + NW_GTPV1U_EPC_MIN_HEADER_SIZE) <= tpduOffset,
- "Mismatch GTPU len, msgExtraLen %u tpduOffset %u",
- msgExtraLen,
- (uint32_t) tpduOffset);
- pMsg->msgBuf = tpdu;
- pMsg->msgBufLen = tpduLength + msgExtraLen + NW_GTPV1U_EPC_MIN_HEADER_SIZE;
- pMsg->msgBufOffset = tpduOffset - (msgExtraLen + NW_GTPV1U_EPC_MIN_HEADER_SIZE);
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- GTPU_DEBUG("MSG length %u, offset %u -> length %u offset %u\n",
- tpduLength, tpduOffset,
- pMsg->msgBufLen, pMsg->msgBufOffset);
-#endif
-
- // Version field: This field is used to determine the version of the GTP-U protocol.
- // The version number shall be set to '1'.
- pMsg->version = NW_GTPU_VERSION;
- // Protocol Type (PT): This bit is used as a protocol discriminator between GTP (when PT is '1')
- // and GTP' (when PT is '0'). GTP is described in this document and the GTP' protocol in 3GPP TS 32.295 [8].
- // Note that the interpretation of the header fields may be different in GTP' than in GTP.
- pMsg->protocolType = NW_GTP_PROTOCOL_TYPE_GTP;
- // Extension Header flag (E): This flag indicates the presence of a meaningful value of the Next Extension
- // Header field. When it is set to '0', the Next Extension Header field either is not present or, if present,
- // shall not be interpreted.
- pMsg->extHdrFlag = NW_FALSE;
- // Sequence number flag (S): This flag indicates the presence of a meaningful value of the Sequence Number field.
- // When it is set to '0', the Sequence Number field either is not present or, if present, shall not be interpreted.
- // When it is set to '1', the Sequence Number field is present, and shall be interpreted, as described below in
- // this section.
- // For the Echo Request, Echo Response, Error Indication and Supported Extension Headers Notification
- // messages, the S flag shall be set to '1'. Since the use of Sequence Numbers is optional for G-PDUs, the PGW,
- // SGW, ePDG and eNodeB should set the flag to '0'. However, when a G-PDU (T-PDU+header) is being relayed
- // by the Indirect Data Forwarding for Inter RAT HO procedure, then if the received G-PDU has the S flag set to
- // '1', then the relaying entity shall set S flag to '1' and forward the G-PDU (T-PDU+header). In an End marker
- // message the S flag shall be set to '0'.
- pMsg->seqNumFlag = (seqNumFlag? NW_TRUE : NW_FALSE);
- pMsg->seqNum = seqNum;
- // N-PDU Number flag (PN): This flag indicates the presence of a meaningful value of the N-PDU Number field.
- // When it is set to '0', the N-PDU Number field either is not present, or, if present, shall not be interpreted.
- // When it is set to '1', the N-PDU Number field is present, and shall be interpreted.
- pMsg->npduNumFlag = NW_FALSE;
- pMsg->npduNum = 0x00;
- // Message Type: This field indicates the type of GTP-U message.
- pMsg->msgType = NW_GTP_GPDU;
- // Length: This field indicates the length in octets of the payload, i.e. the rest of the packet following the
- // mandatory part of the GTP header (that is the first 8 octets).
- // The Sequence Number, the N-PDU Number or any Extension headers shall be considered to be part of the payload,
- // i.e. included in the length count.
- //header_len = ((pMsg->seqNumFlag || pMsg->npduNumFlag || pMsg->extHdrFlag ) ?
- // NW_GTPV1U_EPC_SPECIFIC_HEADER_SIZE : NW_GTPV1U_EPC_MIN_HEADER_SIZE);
- pMsg->msgLen = msgExtraLen + tpduLength;
-
- // Tunnel Endpoint Identifier (TEID): This field unambiguously identifies a tunnel endpoint in the receiving
- // GTP-U protocol entity. The receiving end side of a GTP tunnel locally assigns the TEID value the transmitting
- // side has to use. The TEID shall be used by the receiving entity to find the PDP context, except for the
- // following cases:
- // - The Echo Request/Response and Supported Extension Headers notification messages, where the Tunnel
- // Endpoint Identifier shall be set to all zeroes.
- // - The Error Indication message where the Tunnel Endpoint Identifier shall be set to all zeros.
- pMsg->teid = teid;
- pMsg->nextExtHdrType= 0x00;
-
- //memcpy(pMsg->msgBuf + header_len, tpdu, tpduLength);
- *phMsg = (NwGtpv1uMsgHandleT) pMsg;
- return NW_GTPV1U_OK;
- }
-
- return NW_GTPV1U_FAILURE;
-}
-
-NwGtpv1uRcT
-nwGtpv1uMsgFromMsgNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN NwGtpv1uMsgHandleT hMsg,
- NW_OUT NwGtpv1uMsgHandleT *phMsg)
-{
- NwGtpv1uStackT *pStack = (NwGtpv1uStackT *) hGtpuStackHandle;
- NwGtpv1uMsgT *pMsg;
-
- if(gpGtpv1uMsgPool) {
- pMsg = gpGtpv1uMsgPool;
- gpGtpv1uMsgPool = gpGtpv1uMsgPool->next;
- } else {
- NW_GTPV1U_MALLOC(pStack, sizeof(NwGtpv1uMsgT), pMsg, NwGtpv1uMsgT *);
- }
-
-
- if(pMsg) {
- memcpy(pMsg, (NwGtpv1uMsgT *)hMsg, sizeof(NwGtpv1uMsgT));
- *phMsg = (NwGtpv1uMsgHandleT) pMsg;
- return NW_GTPV1U_OK;
- }
-
- return NW_GTPV1U_FAILURE;
-}
-
-NwGtpv1uRcT
-nwGtpv1uMsgFromBufferNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN uint8_t *pBuf,
- NW_IN uint32_t bufLen,
- NW_OUT NwGtpv1uMsgHandleT *phMsg)
-{
- NwGtpv1uStackT *pStack = (NwGtpv1uStackT *) hGtpuStackHandle;
- NwGtpv1uMsgT *pMsg;
-
- if(gpGtpv1uMsgPool) {
- pMsg = gpGtpv1uMsgPool;
- gpGtpv1uMsgPool = gpGtpv1uMsgPool->next;
- } else {
- NW_GTPV1U_MALLOC(pStack, sizeof(NwGtpv1uMsgT), pMsg, NwGtpv1uMsgT *);
- }
-
-
- if(pMsg) {
- pMsg->msgBuf = pBuf;
-
- pMsg->version = ((*pBuf) & 0xE0) >> 5;
- pMsg->protocolType = ((*pBuf) & 0x10) >> 4;
- pMsg->extHdrFlag = ((*pBuf) & 0x04) >> 2;
- pMsg->seqNumFlag = ((*pBuf) & 0x02) >> 1;
- pMsg->npduNumFlag = ((*pBuf) & 0x01);
- pBuf++;
-
- pMsg->msgType = *(pBuf);
- pBuf++;
-
- pBuf += 2;
-
- pMsg->teid = ntohl(*((uint32_t *)pBuf));
- pBuf += 4;
-
- if(pMsg->extHdrFlag || pMsg->seqNumFlag || pMsg->npduNumFlag) {
- pMsg->seqNum = ntohs(*(((uint16_t *)pBuf)));
- pBuf += 2;
- pMsg->npduNum = *(pBuf++);
- pMsg->nextExtHdrType = *(pBuf++);
- }
-
- pMsg->msgBufOffset = (uint32_t)(pBuf - pMsg->msgBuf);
- pMsg->msgBufLen = bufLen - pMsg->msgBufOffset;
- pMsg->msgLen = bufLen;
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- GTPU_DEBUG("nwGtpv1uMsgFromBufferNew() msgLen %u msgBufLen %u msgBufOffset %u ",
- pMsg->msgLen, pMsg->msgBufLen, pMsg->msgBufOffset);
-#endif
- *phMsg = (NwGtpv1uMsgHandleT) pMsg;
- return NW_GTPV1U_OK;
- }
-
- return NW_GTPV1U_FAILURE;
-}
-
-NwGtpv1uRcT
-nwGtpv1uMsgDelete( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
- NW_IN NwGtpv1uMsgHandleT hMsg)
-{
- ((NwGtpv1uMsgT *)hMsg)->next = gpGtpv1uMsgPool;
- gpGtpv1uMsgPool = (NwGtpv1uMsgT *) hMsg;
- return NW_GTPV1U_OK;
-}
-
-/**
- * Set TEID for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- * @param[in] teid: TEID value.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgSetTeid(NW_IN NwGtpv1uMsgHandleT hMsg, uint32_t teid)
-{
- NwGtpv1uMsgT *thiz = (NwGtpv1uMsgT *) hMsg;
- thiz->teid = teid;
-#if defined(LOG_GTPU) && LOG_GTPU > 0
- GTPU_DEBUG("nwGtpv1uMsgSetTeid() teid %u", teid);
-#endif
- return NW_GTPV1U_OK;
-}
-
-/**
- * Set sequence for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- * @param[in] seqNum: Flag boolean value.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgSetSeqNumber(NW_IN NwGtpv1uMsgHandleT hMsg, uint32_t seqNum)
-{
- NwGtpv1uMsgT *thiz = (NwGtpv1uMsgT *) hMsg;
- thiz->seqNum = seqNum;
- return NW_GTPV1U_OK;
-}
-
-/**
- * Get TEID present for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- */
-
-uint32_t
-nwGtpv1uMsgGetTeid(NW_IN NwGtpv1uMsgHandleT hMsg)
-{
- NwGtpv1uMsgT *thiz = (NwGtpv1uMsgT *) hMsg;
- return (thiz->teid);
-}
-
-
-/**
- * Get sequence number for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- */
-
-uint32_t
-nwGtpv1uMsgGetSeqNumber(NW_IN NwGtpv1uMsgHandleT hMsg)
-{
- NwGtpv1uMsgT *thiz = (NwGtpv1uMsgT *) hMsg;
- return (thiz->seqNum);
-}
-
-/**
- * Get msg type for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- */
-
-uint32_t
-nwGtpv1uMsgGetMsgType(NW_IN NwGtpv1uMsgHandleT hMsg)
-{
- NwGtpv1uMsgT *thiz = (NwGtpv1uMsgT *) hMsg;
- return (thiz->msgType);
-}
-
-/**
- * Get tpdu for gtpv1u message.
- *
- * @param[in] hMsg : Message handle.
- */
-
-NwGtpv1uRcT
-nwGtpv1uMsgGetTpdu(NW_IN NwGtpv1uMsgHandleT hMsg, uint8_t *pTpduBuf,
- uint32_t *pTpduLength)
-{
- NwGtpv1uMsgT *thiz = (NwGtpv1uMsgT *) hMsg;
- uint8_t headerLength = ((thiz->seqNumFlag || thiz->extHdrFlag
- || thiz->npduNumFlag) ? 12 : 8);
-
- *pTpduLength = thiz->msgLen - headerLength;
- memcpy(pTpduBuf, thiz->msgBuf + headerLength, *pTpduLength);
- return NW_GTPV1U_OK;
-}
-
-uint8_t *
-nwGtpv1uMsgGetTpduHandle(NW_IN NwGtpv1uMsgHandleT hMsg)
-{
- NwGtpv1uMsgT *thiz = (NwGtpv1uMsgT *) hMsg;
- return (thiz->msgBuf + ((thiz->seqNumFlag || thiz->extHdrFlag
- || thiz->npduNumFlag) ? 12 : 8));
-}
-
-uint32_t
-nwGtpv1uMsgGetTpduLength(NW_IN NwGtpv1uMsgHandleT hMsg)
-{
- NwGtpv1uMsgT *thiz = (NwGtpv1uMsgT *) hMsg;
- return (thiz->msgLen - ((thiz->seqNumFlag || thiz->extHdrFlag
- || thiz->npduNumFlag) ? 12 : 8));
-}
-
-NwGtpv1uRcT
-nwGtpv1uMsgAddIeTV1(NW_IN NwGtpv1uMsgHandleT hMsg,
- NW_IN uint8_t type,
- NW_IN uint8_t value)
-{
- NwGtpv1uMsgT *pMsg = (NwGtpv1uMsgT *) hMsg;
- NwGtpv1uIeTv1T *pIe;
-
- pIe = (NwGtpv1uIeTv1T *) (pMsg->msgBuf + pMsg->msgLen);
-
- pIe->t = type;
- pIe->v = value;
-
- pMsg->msgLen += sizeof(NwGtpv1uIeTv1T);
-
- return NW_GTPV1U_OK;
-}
-
-NwGtpv1uRcT
-nwGtpv1uMsgAddIeTV2(NW_IN NwGtpv1uMsgHandleT hMsg,
- NW_IN uint8_t type,
- NW_IN uint16_t length,
- NW_IN uint16_t value)
-{
- NwGtpv1uMsgT *pMsg = (NwGtpv1uMsgT *) hMsg;
- NwGtpv1uIeTv2T *pIe;
-
- pIe = (NwGtpv1uIeTv2T *) (pMsg->msgBuf + pMsg->msgLen);
-
- pIe->t = type;
- pIe->v = htons(value);
-
- pMsg->msgLen += sizeof(NwGtpv1uIeTv2T);
-
- return NW_GTPV1U_OK;
-}
-
-NwGtpv1uRcT
-nwGtpv1uMsgAddIeTV4(NW_IN NwGtpv1uMsgHandleT hMsg,
- NW_IN uint8_t type,
- NW_IN uint16_t length,
- NW_IN uint32_t value)
-{
- NwGtpv1uMsgT *pMsg = (NwGtpv1uMsgT *) hMsg;
- NwGtpv1uIeTv4T *pIe;
-
- pIe = (NwGtpv1uIeTv4T *) (pMsg->msgBuf + pMsg->msgLen);
-
- pIe->t = type;
- pIe->v = htonl(value);
-
- pMsg->msgLen += sizeof(NwGtpv1uIeTv4T);
-
- return NW_GTPV1U_OK;
-}
-
-NwGtpv1uRcT
-nwGtpv1uMsgAddIe(NW_IN NwGtpv1uMsgHandleT hMsg,
- NW_IN uint8_t type,
- NW_IN uint16_t length,
- NW_IN uint8_t *pVal)
-{
- NwGtpv1uMsgT *pMsg = (NwGtpv1uMsgT *) hMsg;
- NwGtpv1uIeTlvT *pIe;
-
- pIe = (NwGtpv1uIeTlvT *) (pMsg->msgBuf + pMsg->msgLen);
-
- pIe->t = type;
- pIe->l = htons(length);
-
- memcpy(pIe + 4, pVal, length);
- pMsg->msgLen += (4 + length);
-
- return NW_GTPV1U_OK;
-}
-
-NwGtpv1uRcT
-nwGtpv1uMsgHexDump(NwGtpv1uMsgHandleT hMsg, FILE *fp)
-{
-
- NwGtpv1uMsgT *pMsg = (NwGtpv1uMsgT *) hMsg;
- uint8_t *data = pMsg->msgBuf;
- uint32_t size = pMsg->msgLen;
-
- unsigned char *p = (unsigned char *)data;
- unsigned char c;
- int n;
- char bytestr[4] = {0};
- char addrstr[10] = {0};
- char hexstr[ 16*3 + 5] = {0};
- char charstr[16*1 + 5] = {0};
- fprintf((FILE *)fp, "\n");
-
- for(n=1; n<=size; n++) {
- if (n%16 == 1) {
- /* store address for this line */
- snprintf(addrstr, sizeof(addrstr), "%.4lx",
- (p-data) );
- }
-
- c = *p;
-
- if (isalnum(c) == 0) {
- c = '.';
- }
-
- /* store hex str (for left side) */
- snprintf(bytestr, sizeof(bytestr), "%02X ", *p);
- strncat(hexstr, bytestr, sizeof(hexstr)-strlen(hexstr)-1);
-
- /* store char str (for right side) */
- snprintf(bytestr, sizeof(bytestr), "%c", c);
- strncat(charstr, bytestr, sizeof(charstr)-strlen(charstr)-1);
-
- if(n%16 == 0) {
- /* line completed */
- fprintf((FILE *)fp, "[%4.4s] %-50.50s %s\n", addrstr, hexstr, charstr);
- hexstr[0] = 0;
- charstr[0] = 0;
- } else if(n%8 == 0) {
- /* half line: add whitespaces */
- strncat(hexstr, " ", sizeof(hexstr)-strlen(hexstr)-1);
- strncat(charstr, " ", sizeof(charstr)-strlen(charstr)-1);
- }
-
- p++; /* next byte */
- }
-
- if (strlen(hexstr) > 0) {
- /* print rest of buffer if not empty */
- fprintf((FILE *)fp, "[%4.4s] %-50.50s %s\n", addrstr, hexstr, charstr);
-
- }
-
- fprintf((FILE *)fp, "\n");
-
- return NW_GTPV1U_OK;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-/*--------------------------------------------------------------------------*
- * E N D O F F I L E *
- *--------------------------------------------------------------------------*/
diff --git a/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTrxn.c b/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTrxn.c
deleted file mode 100644
index 27cb59050f9f4084f369d5c3f16d40cd5bb81fb7..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTrxn.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 u *
- * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "NwTypes.h"
-#include "NwLog.h"
-#include "NwUtils.h"
-#include "NwGtpv1uLog.h"
-#include "NwGtpv1u.h"
-#include "NwGtpv1uPrivate.h"
-#include "NwGtpv1uTrxn.h"
-
-/*--------------------------------------------------------------------------*
- * P R I V A T E D E C L A R A T I O N S *
- *--------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static NwGtpv1uTrxnT *gpGtpv1uTrxnPool = NULL;
-
-/*--------------------------------------------------------------------------*
- * P R I V A T E F U N C T I O N S *
- *--------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------
- * Send msg retransmission to peer via data request to UDP Entity
- *--------------------------------------------------------------------------*/
-
-static NwGtpv1uRcT
-nwGtpv1uTrxnSendMsgRetransmission(NwGtpv1uTrxnT *thiz)
-{
- NwGtpv1uRcT rc;
-
- NW_ASSERT(thiz);
- NW_ASSERT(thiz->pMsg);
-
- rc = thiz->pStack->udp.udpDataReqCallback(thiz->pStack->udp.hUdp,
- thiz->pMsg->msgBuf,
- thiz->pMsg->msgLen,
- thiz->pMsg->msgBufOffset,
- thiz->peerIp,
- thiz->peerPort);
-
- return rc;
-}
-
-static NwGtpv1uRcT
-nwGtpv1uTrxnPeerRspTimeout(void *arg)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- NwGtpv1uTrxnT *thiz;
- NwGtpv1uStackT *pStack;
- NwGtpv1uTimeoutInfoT *timeoutInfo = arg;
-
- thiz = ((NwGtpv1uTrxnT *)timeoutInfo->timeoutArg);
- pStack = thiz->pStack;
-
- NW_ASSERT(pStack);
-
- NW_LOG(pStack, NW_LOG_LEVEL_WARN, "T3 timer expired for transaction 0x%p",
- thiz);
-
- rc = nwGtpv1uTrxnSendMsgRetransmission(thiz);
-
- if(thiz->maxRetries) {
- rc = pStack->tmrMgr.tmrStartCallback(pStack->tmrMgr.tmrMgrHandle,
- thiz->t3Timer, 0, NW_GTPV1U_TMR_TYPE_ONE_SHOT, (void *)timeoutInfo,
- &thiz->hRspTmr);
- thiz->maxRetries--;
- } else {
- NwGtpv1uUlpApiT ulpApi;
- ulpApi.apiType = NW_GTPV1U_ULP_API_RSP_FAILURE;
- ulpApi.apiInfo.recvMsgInfo.msgType = nwGtpv1uMsgGetMsgType((
- NwGtpv1uMsgHandleT)thiz->pMsg);
- ulpApi.apiInfo.recvMsgInfo.hUlpTrxn = thiz->hUlpTrxn;
- ulpApi.apiInfo.recvMsgInfo.peerIp = thiz->peerIp;
- ulpApi.apiInfo.recvMsgInfo.peerPort = thiz->peerPort;
- thiz->hRspTmr = 0;
-
- rc = nwGtpv1uTrxnDelete(&thiz);
- NW_ASSERT(rc == NW_GTPV1U_OK);
-
- rc = pStack->ulp.ulpReqCallback(pStack->ulp.hUlp, &ulpApi);
- NW_ASSERT(rc == NW_GTPV1U_OK);
- }
-
- return rc;
-}
-
-/**
- Send timer start request to TmrMgr Entity.
-
- @param[in] thiz : Pointer to transaction
- @param[in] timeoutCallbackFunc : Timeout handler callback function.
- @return NW_GTPV1U_OK on success.
- */
-
-static NwGtpv1uRcT
-nwGtpv1uTrxnStartPeerRspTimer(NwGtpv1uTrxnT *thiz,
- NwGtpv1uRcT (*timeoutCallbackFunc)(void *))
-{
- NwGtpv1uRcT rc;
- NwGtpv1uTimeoutInfoT *timeoutInfo;
-
- NW_ASSERT(thiz->pStack->tmrMgr.tmrStartCallback != NULL);
-
- timeoutInfo = &thiz->peerRspTimeoutInfo;
- timeoutInfo->timeoutArg = thiz;
- timeoutInfo->timeoutCallbackFunc = timeoutCallbackFunc;
- timeoutInfo->hStack = (NwGtpv1uStackHandleT)thiz->pStack;
-
- rc = thiz->pStack->tmrMgr.tmrStartCallback(thiz->pStack->tmrMgr.tmrMgrHandle,
- thiz->t3Timer, 0, NW_GTPV1U_TMR_TYPE_ONE_SHOT, (void *)timeoutInfo,
- &thiz->hRspTmr);
-
- return rc;
-}
-
-/**
- Send timer stop request to TmrMgr Entity.
-
- @param[in] thiz : Pointer to transaction
- @return NW_GTPV1U_OK on success.
- */
-
-static NwGtpv1uRcT
-nwGtpv1uTrxnStopPeerRspTimer(NwGtpv1uTrxnT *thiz)
-{
- NwGtpv1uRcT rc;
-
- NW_ASSERT(thiz->pStack->tmrMgr.tmrStopCallback != NULL);
-
- rc = thiz->pStack->tmrMgr.tmrStopCallback(thiz->pStack->tmrMgr.tmrMgrHandle,
- thiz->hRspTmr);
-
- thiz->hRspTmr = 0;
-
- return rc;
-}
-
-/*--------------------------------------------------------------------------*
- * P U B L I C F U N C T I O N S *
- *--------------------------------------------------------------------------*/
-
-/**
- * Constructor
- *
- * @param[in] thiz : Pointer to stack
- * @param[out] ppTrxn : Pointer to pointer to Trxn object.
- * @return NW_GTPV1U_OK on success.
- */
-NwGtpv1uRcT
-nwGtpv1uTrxnNew( NW_IN NwGtpv1uStackT *thiz,
- NW_OUT NwGtpv1uTrxnT **ppTrxn)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- NwGtpv1uTrxnT *pTrxn;
-
- if(gpGtpv1uTrxnPool) {
- pTrxn = gpGtpv1uTrxnPool;
- gpGtpv1uTrxnPool = gpGtpv1uTrxnPool->next;
- } else {
- NW_GTPV1U_MALLOC(thiz, sizeof(NwGtpv1uTrxnT), pTrxn, NwGtpv1uTrxnT *);
- }
-
- if (pTrxn) {
- pTrxn->maxRetries = 2;
- pTrxn->pStack = thiz;
- pTrxn->t3Timer = 2;
- pTrxn->seqNum = thiz->seq;
-
- /* Increment sequence number */
- thiz->seq++;
-
- if(thiz->seq == 0x800000) {
- thiz->seq = 0;
- }
-
- } else {
- rc = NW_GTPV1U_FAILURE;
- }
-
- NW_LOG(thiz, NW_LOG_LEVEL_DEBG, "Created transaction 0x%p", pTrxn);
-
- *ppTrxn = pTrxn;
-
- return rc;
-}
-
-/**
- * Overloaded Constructor
- *
- * @param[in] thiz : Pointer to stack.
- * @param[in] seqNum : Sequence number for this transaction.
- * @param[out] ppTrxn : Pointer to pointer to Trxn object.
- * @return NW_GTPV1U_OK on success.
- */
-NwGtpv1uRcT
-nwGtpv1uTrxnWithSeqNew( NW_IN NwGtpv1uStackT *thiz,
- NW_IN uint32_t seqNum,
- NW_OUT NwGtpv1uTrxnT **ppTrxn)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- NwGtpv1uTrxnT *pTrxn;
-
- if(gpGtpv1uTrxnPool) {
- pTrxn = gpGtpv1uTrxnPool;
- gpGtpv1uTrxnPool = gpGtpv1uTrxnPool->next;
- } else {
- NW_GTPV1U_MALLOC(thiz, sizeof(NwGtpv1uTrxnT), pTrxn, NwGtpv1uTrxnT *);
- }
-
-
- if (pTrxn) {
- pTrxn->maxRetries = 2;
- pTrxn->pStack = thiz;
- pTrxn->t3Timer = 2;
- pTrxn->seqNum = seqNum;
- pTrxn->pMsg = NULL;
- } else {
- rc = NW_GTPV1U_FAILURE;
- }
-
- NW_LOG(thiz, NW_LOG_LEVEL_DEBG, "Created transaction 0x%p", pTrxn);
-
- *ppTrxn = pTrxn;
-
- return rc;
-}
-
-/**
- * Destructor
- *
- * @param[out] pthiz : Pointer to pointer to Trxn object.
- * @return NW_GTPV1U_OK on success.
- */
-NwGtpv1uRcT
-nwGtpv1uTrxnDelete( NW_INOUT NwGtpv1uTrxnT **pthiz)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- NwGtpv1uStackT *pStack;
- NwGtpv1uTrxnT *thiz = *pthiz;
-
- pStack = thiz->pStack;
-
- if(thiz->hRspTmr) {
- rc = nwGtpv1uTrxnStopPeerRspTimer(thiz);
- NW_ASSERT(rc == NW_GTPV1U_OK);
- }
-
- if(thiz->pMsg) {
- rc = nwGtpv1uMsgDelete((NwGtpv1uStackHandleT)pStack,
- (NwGtpv1uMsgHandleT)thiz->pMsg);
- NW_ASSERT(rc == NW_GTPV1U_OK);
- }
-
- thiz->next = gpGtpv1uTrxnPool;
- gpGtpv1uTrxnPool = thiz;
-
- NW_LOG(pStack, NW_LOG_LEVEL_DEBG, "Purged transaction 0x%p", thiz);
-
- *pthiz = NULL;
- return rc;
-}
-
-
-#if 1
-/**
- * Send msg to peer via data request to UDP Entity
- *
- * @param[in] thiz : Pointer to stack.
- * @param[in] pTrxn : Pointer to Trxn object.
- * @param[in] peerIp : Peer Ip address.
- * @param[in] peerPort : Peer Ip port.
- * @param[in] pMsg : Message to be sent.
- * @return NW_GTPV1U_OK on success.
- */
-NwGtpv1uRcT
-nwGtpv1uTrxnCreateAndSendMsg( NW_IN NwGtpv1uStackT *thiz,
- NW_IN NwGtpv1uTrxnT *pTrxn,
- NW_IN uint32_t peerIp,
- NW_IN uint32_t peerPort,
- NW_IN NwGtpv1uMsgT *pMsg)
-{
- NwGtpv1uRcT rc;
- uint8_t *msgHdr;
-
- NW_ASSERT(thiz);
- NW_ASSERT(pMsg);
-
- msgHdr = &pMsg->msgBuf[pMsg->msgBufOffset];
-
- NW_ASSERT(msgHdr != NULL);
-
- *(msgHdr++) = (pMsg->version << 5) |
- (pMsg->protocolType << 4) |
- (pMsg->extHdrFlag << 2) |
- (pMsg->seqNumFlag << 1) |
- (pMsg->npduNumFlag);
-
- *(msgHdr++) = (pMsg->msgType);
- *((uint16_t *) msgHdr) = htons(pMsg->msgLen);
- msgHdr += 2;
-
- *((uint32_t *) msgHdr) = htonl(pMsg->teid);
- msgHdr += 4;
-
- if(pMsg->seqNumFlag | pMsg->extHdrFlag | pMsg->npduNumFlag) {
- if(pMsg->seqNumFlag) {
- *((uint16_t *) msgHdr) = htons((pTrxn ? pTrxn->seqNum : pMsg->seqNum));
- } else {
- *((uint16_t *) msgHdr) = 0x0000;
- }
-
- msgHdr += 2;
-
- if(pMsg->npduNumFlag) {
- *((uint8_t *) msgHdr) = pMsg->npduNumFlag;
- } else {
- *((uint8_t *) msgHdr) = 0x00;
- }
-
- msgHdr++;
-
- if(pMsg->extHdrFlag) {
- *((uint8_t *) msgHdr) = pMsg->extHdrFlag;
- } else {
- *((uint8_t *) msgHdr) = 0x00;
- }
-
- msgHdr++;
- }
-
- NW_ASSERT(thiz->udp.udpDataReqCallback != NULL);
-
- rc = thiz->udp.udpDataReqCallback(thiz->udp.hUdp,
- pMsg->msgBuf,
- pMsg->msgLen,
- pMsg->msgBufOffset,
- peerIp,
- peerPort);
-
- /* Save the message for retransmission */
- if(rc == NW_GTPV1U_OK && pTrxn) {
- pTrxn->pMsg = pMsg;
- pTrxn->peerIp = peerIp;
- pTrxn->peerPort = peerPort;
-
- rc = nwGtpv1uTrxnStartPeerRspTimer(pTrxn, nwGtpv1uTrxnPeerRspTimeout);
- NW_ASSERT(rc == NW_GTPV1U_OK);
- }
-
- return rc;
-}
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-/*--------------------------------------------------------------------------*
- * E N D O F F I L E *
- *--------------------------------------------------------------------------*/
diff --git a/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c b/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
deleted file mode 100644
index c62f60edc29725de705589767f4027d617b5fe03..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 u *
- * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *
- * *
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "NwTypes.h"
-#include "NwUtils.h"
-#include "NwGtpv1uError.h"
-#include "NwGtpv1uPrivate.h"
-#include "NwGtpv1uMsg.h"
-#include "NwGtpv1uTunnelEndPoint.h"
-#include "NwGtpv1u.h"
-#include "NwGtpv1uLog.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*--------------------------------------------------------------------------*
- * P R I V A T E D E C L A R A T I O N S *
- *--------------------------------------------------------------------------*/
-
-static NwGtpv1uTunnelEndPointT *gpTunnelEndPointPool = NULL;
-
-/*--------------------------------------------------------------------------*
- * P U B L I C F U N C T I O N S *
- *--------------------------------------------------------------------------*/
-
-/**
- Constructor
-
- @param[in] msid: MSID
- @param[in] peerAddr: Address of the peer.
- @return Pointer to Session on success, NULL on failure.
- */
-
-
-NwGtpv1uTunnelEndPointT *
-nwGtpTunnelEndPointNew(struct NwGtpv1uStack *pStack)
-{
- NwGtpv1uTunnelEndPointT *thiz;
-
- if(gpTunnelEndPointPool) {
- thiz = gpTunnelEndPointPool;
- gpTunnelEndPointPool = gpTunnelEndPointPool->next;
- } else {
- NW_GTPV1U_MALLOC(pStack, sizeof(NwGtpv1uTunnelEndPointT), thiz,
- NwGtpv1uTunnelEndPointT *);
- }
-
- return thiz;
-}
-
-/**
- Destructor
-
- @param[in] thiz: Pointer to session
- @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpTunnelEndPointDestroy(struct NwGtpv1uStack *pStack,
- NwGtpv1uTunnelEndPointT *thiz)
-{
- thiz->next = gpTunnelEndPointPool;
- gpTunnelEndPointPool = thiz;
- return NW_GTPV1U_OK;
-}
-
-/**
- Purge a Transaction for a Session.
-
- @param[in] thiz: Pointer to session
- @param[in,out] pTrxn: Pointer to the trxn.
- @return NW_GTPV1U_OK on success.
- */
-
-NwGtpv1uRcT
-nwGtpSessionSendMsgApiToUlpEntity(NwGtpv1uTunnelEndPointT *thiz,
- NwGtpv1uMsgT *pMsg)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- NwGtpv1uUlpApiT api;
-
- api.apiType = NW_GTPV1U_ULP_API_RECV_TPDU;
- api.apiInfo.recvMsgInfo.hUlpSession = thiz->hUlpSession;
- api.apiInfo.recvMsgInfo.teid = thiz->teid;
- api.apiInfo.recvMsgInfo.hMsg = (NwGtpv1uMsgHandleT)pMsg;
-
- NW_ASSERT(thiz->pStack->ulp.ulpReqCallback != NULL);
-
- thiz->pStack->ulp.ulpReqCallback(thiz->pStack->ulp.hUlp, &api);
-
- return rc;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-/*--------------------------------------------------------------------------*
- * E N D O F F I L E *
- *--------------------------------------------------------------------------*/
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/Makefile.am b/openair3/GTPV1-U/nw-gtpv1u/test-app/Makefile.am
deleted file mode 100644
index 69b8e698e9aeef64a8ddd4fcf6913984a95613b3..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# this is example-file: Makefile.am
-
-# the subdirectories of the project to go into
-SUBDIRS = \
- nw-helloworld
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/Makefile.in b/openair3/GTPV1-U/nw-gtpv1u/test-app/Makefile.in
deleted file mode 100644
index 46928b9e3cf392488358170b3015da0574502cd5..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/Makefile.in
+++ /dev/null
@@ -1,461 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# this is example-file: Makefile.am
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = nw-gtpv1u/test-app
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# the subdirectories of the project to go into
-SUBDIRS = \
- nw-helloworld
-
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu nw-gtpv1u/test-app/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu nw-gtpv1u/test-app/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-info: install-info-recursive
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic ctags \
- ctags-recursive distclean distclean-generic distclean-tags \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
- tags-recursive uninstall uninstall-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.am b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.am
deleted file mode 100644
index f60cd93f555f2fd4a96562e2a5fcbba9c5b20b06..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-bin_PROGRAMS = helloworld
-
-AM_CFLAGS = -D__WITH_LIBEVENT__ -I../../shared -I../../include -I../../test-app/nw-udp -I../../test-app/nw-log @AM_CFLAGS@
-
-helloworld_SOURCES = \
- NwEvt.h\
- NwMiniLogMgrEntity.h\
- NwMiniTmrMgrEntity.h\
- NwMiniUlpEntity.h\
- NwMiniUdpEntity.h\
- NwMiniLogMgrEntity.c\
- NwMiniTmrMgrEntity.c\
- NwMiniUlpEntity.c\
- NwMiniUdpEntity.c\
- helloworld.c
-
-helloworld_LDADD = ../../src/libNwGtpv1u.a -levent $(AM_LDFLAGS)
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.in b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.in
deleted file mode 100644
index 769d75c16bfccfbfebf77881d4e2fec91b576586..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.in
+++ /dev/null
@@ -1,433 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-bin_PROGRAMS = helloworld$(EXEEXT)
-subdir = nw-gtpv1u/test-app/nw-helloworld
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_helloworld_OBJECTS = NwMiniLogMgrEntity.$(OBJEXT) \
- NwMiniTmrMgrEntity.$(OBJEXT) NwMiniUlpEntity.$(OBJEXT) \
- NwMiniUdpEntity.$(OBJEXT) helloworld.$(OBJEXT)
-helloworld_OBJECTS = $(am_helloworld_OBJECTS)
-am__DEPENDENCIES_1 =
-helloworld_DEPENDENCIES = ../../src/libNwGtpv1u.a \
- $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(helloworld_SOURCES)
-DIST_SOURCES = $(helloworld_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CFLAGS = -D__WITH_LIBEVENT__ -I../../shared -I../../include -I../../test-app/nw-udp -I../../test-app/nw-log @AM_CFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-helloworld_SOURCES = \
- NwEvt.h\
- NwMiniLogMgrEntity.h\
- NwMiniTmrMgrEntity.h\
- NwMiniUlpEntity.h\
- NwMiniUdpEntity.h\
- NwMiniLogMgrEntity.c\
- NwMiniTmrMgrEntity.c\
- NwMiniUlpEntity.c\
- NwMiniUdpEntity.c\
- helloworld.c
-
-helloworld_LDADD = ../../src/libNwGtpv1u.a -levent $(AM_LDFLAGS)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu nw-gtpv1u/test-app/nw-helloworld/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu nw-gtpv1u/test-app/nw-helloworld/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
-
-clean-binPROGRAMS:
- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-helloworld$(EXEEXT): $(helloworld_OBJECTS) $(helloworld_DEPENDENCIES)
- @rm -f helloworld$(EXEEXT)
- $(LINK) $(helloworld_OBJECTS) $(helloworld_LDADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NwMiniLogMgrEntity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NwMiniTmrMgrEntity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NwMiniUdpEntity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NwMiniUlpEntity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helloworld.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
- for dir in "$(DESTDIR)$(bindir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic ctags distclean distclean-compile \
- distclean-generic distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-binPROGRAMS
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwEvt.h b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwEvt.h
deleted file mode 100644
index 6df5794a5ffff32f98f87b78cd9408ee2887835d..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwEvt.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * Copyright (c) 2010-2011 Amit Chawre *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without *
- * modification, are permitted provided that the following conditions *
- * are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright *
- * notice, this list of conditions and the following disclaimer. *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * 3. The name of the author may not be used to endorse or promote products *
- * derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR *
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES *
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, *
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT *
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF *
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- *----------------------------------------------------------------------------*/
-
-#ifndef __NW_EVT_H__
-#define __NW_EVT_H__
-/**
- * @file NwEvt.h
- * @brief
-*/
-
-#ifdef __WITH_LIBEVENT__
-
-#include <event.h>
-
-typedef struct event NwEventT;
-
-#define NW_EVT_READ (EV_READ)
-#define NW_EVT_PERSIST (EV_PERSIST)
-#define NW_EVT_CALLBACK(__cbFunc) __cbFunc(int fd, short event, void *arg)
-#define NW_TMR_CALLBACK(__cbFunc) __cbFunc(int fd, short event, void *arg)
-
-#define NW_EVT_INIT event_init
-#define NW_EVT_LOOP event_dispatch
-
-#define NW_EVENT_ADD(__ev, __evSelObj, __evCallback, __evCallbackArg, __evFlags) \
- do { \
- event_set(&(__ev), __evSelObj, __evFlags, __evCallback, __evCallbackArg); \
- event_add(&(__ev), NULL); \
- } while(0)
-
-#else
-
-#warning "Event library not defined!"
-
-/* HACK : Defining dummy values for compilation!*/
-
-typedef struct {
- int __tbd;
-} NwEventT;
-
-#define NW_EVT_READ (0)
-#define NW_EVT_PERSIST (1)
-#define NW_EVT_CALLBACK(__cbFunc) __cbFunc(void *arg)
-#define NW_TMR_CALLBACK(__cbFunc) __cbFunc(void *arg)
-
-
-#define NW_EVT_INIT() do { printf("error: Event library not defined!\n"); exit (0); } while(0)
-#define NW_EVT_LOOP() do { printf("error: Event library not defined!\n"); exit (0); } while(0)
-#define NW_EVENT_ADD(...) do { printf("error: Event library not defined!\n"); exit (0); } while(0)
-
-
-#endif
-
-#endif /* __NW_EVT_H__ */
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.c b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.c
deleted file mode 100644
index c50e6a17db46813029faf6d062cf9daa87bb2e61..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * M I N I M A L I S T I C L O G M G R E N T I T Y *
- * *
- * Copyright (C) 2010 Amit Chawre. *
- * *
- *----------------------------------------------------------------------------*/
-
-/**
- * @file hello-world.c
- * @brief This file contains example of a minimalistic log manager entity.
-*/
-
-#include <stdio.h>
-#include <assert.h>
-#include "NwLog.h"
-#include "NwEvt.h"
-#include "NwGtpv1u.h"
-
-#include "NwMiniLogMgrEntity.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-uint32_t g_log_level = NW_LOG_LEVEL_INFO;
-
-/*---------------------------------------------------------------------------
- * Public functions
- *--------------------------------------------------------------------------*/
-
-NwGtpv1uRcT nwMiniLogMgrInit(NwMiniLogMgrT *thiz, uint32_t logLevel )
-{
- thiz->logLevel = logLevel;
- return NW_GTPV1U_OK;
-}
-
-NwGtpv1uRcT nwMiniLogMgrSetLogLevel(NwMiniLogMgrT *thiz, uint32_t logLevel)
-{
- thiz->logLevel = logLevel;
-}
-
-NwGtpv1uRcT nwMiniLogMgrLogRequest (NwGtpv1uLogMgrHandleT hLogMgr,
- uint32_t logLevel,
- NwCharT *file,
- uint32_t line,
- NwCharT *logStr)
-{
- NwMiniLogMgrT *thiz = (NwMiniLogMgrT *) hLogMgr;
-
- if(thiz->logLevel >= logLevel) {
- printf("NWGTPv2U-STK %s - %s <%s,%u>\n", gLogLevelStr[logLevel], logStr,
- basename(file), line);
- }
-
- return NW_GTPV1U_OK;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.h b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.h
deleted file mode 100644
index 18b60aa611721c54e5652f2602503e6c184f2964..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * M I N I M A L I S T I C L O G M G R E N T I T Y *
- * *
- * Copyright (C) 2010 Amit Chawre. *
- * *
- *----------------------------------------------------------------------------*/
-
-/**
- * @file hello-world.c
- * @brief This file contains example of a minimalistic log manager entity.
-*/
-
-#include <stdio.h>
-#include <assert.h>
-#include "NwEvt.h"
-#include "NwLog.h"
-
-#ifndef __NW_MINI_LOG_MGR_H__
-#define __NW_MINI_LOG_MGR_H__
-
-#ifndef NW_ASSERT
-#define NW_ASSERT assert
-#endif
-
-extern uint32_t g_log_level;
-
-
-#define NW_LOG( _logLevel, ...) \
- do { \
- if(g_log_level >= _logLevel) \
- { \
- char _logStr[1024]; \
- snprintf(_logStr, 1024, __VA_ARGS__); \
- printf("NWGTPv2U-APP %s - %s <%s,%d>\n", gLogLevelStr[_logLevel], _logStr, basename(__FILE__), __LINE__);\
- } \
- } while(0)
-
-typedef struct {
- uint8_t logLevel;
-} NwMiniLogMgrT;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-NwGtpv1uRcT nwMiniLogMgrLogRequest (NwGtpv1uLogMgrHandleT logMgrHandle,
- uint32_t logLevel,
- NwCharT* file,
- uint32_t line,
- NwCharT* logStr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.c b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.c
deleted file mode 100644
index 63ad59b23f82b5cd731305a8c1258b48efe5cd37..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * M I N I M A L I S T I C T M R M G R E N T I T Y *
- * *
- * Copyright (C) 2010 Amit Chawre. *
- * *
- *----------------------------------------------------------------------------*/
-
-/**
- * @file NwMiniTmrMgrEntity.c
- * @brief This file ontains example of a minimalistic timer manager entity.
-*/
-
-#include <stdio.h>
-#include <assert.h>
-#include "NwEvt.h"
-#include "NwGtpv1u.h"
-#include "NwMiniLogMgrEntity.h"
-#include "NwMiniTmrMgrEntity.h"
-
-#ifndef NW_ASSERT
-#define NW_ASSERT assert
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*---------------------------------------------------------------------------
- * Private functions
- *--------------------------------------------------------------------------*/
-
-static void
-NW_TMR_CALLBACK(nwMiniTmrMgrHandleTimeout)
-{
- NwGtpv1uRcT rc;
- NwMiniTmrMgrEntityT *pTmr = (NwMiniTmrMgrEntityT *) arg;
-
- /*---------------------------------------------------------------------------
- * Send Timeout Request to GTPv1u Stack Instance
- *--------------------------------------------------------------------------*/
-
- rc = nwGtpv1uProcessTimeout(pTmr->timeoutArg);
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- free(pTmr);
-
- return;
-}
-
-/*---------------------------------------------------------------------------
- * Public functions
- *--------------------------------------------------------------------------*/
-
-NwGtpv1uRcT nwTimerStart( NwGtpv1uTimerMgrHandleT tmrMgrHandle,
- uint32_t timeoutSec,
- uint32_t timeoutUsec,
- uint32_t tmrType,
- void *timeoutArg,
- NwGtpv1uTimerHandleT *hTmr)
-{
- NwGtpv1uRcT rc = NW_GTPV1U_OK;
- NwMiniTmrMgrEntityT *pTmr;
- struct timeval tv;
-
- NW_LOG(NW_LOG_LEVEL_INFO,
- "Received start timer request from stack with timer type %d , arg %x, for %d sec and %d usec",
- tmrType, (unsigned int)timeoutArg, timeoutSec, timeoutUsec);
-
- pTmr = (NwMiniTmrMgrEntityT *) malloc (sizeof(NwMiniTmrMgrEntityT));
-
- /* set the timevalues*/
- timerclear(&tv);
- tv.tv_sec = timeoutSec;
- tv.tv_usec = timeoutUsec;
-
- pTmr->timeoutArg = timeoutArg;
- evtimer_set(&pTmr->ev, nwMiniTmrMgrHandleTimeout, pTmr);
-
- /*add event*/
-
- event_add(&(pTmr->ev), &tv);
-
- *hTmr = (NwGtpv1uTimerHandleT)pTmr;
-
- return rc;
-}
-
-NwGtpv1uRcT nwTimerStop( NwGtpv1uTimerMgrHandleT tmrMgrHandle,
- NwGtpv1uTimerHandleT hTmr)
-{
- NW_LOG(NW_LOG_LEVEL_INFO,
- "Received stop timer request from stack for timer handle %d", hTmr);
- evtimer_del(&(((NwMiniTmrMgrEntityT *)hTmr)->ev));
- free((void *)hTmr);
- return NW_GTPV1U_OK;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.h b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.h
deleted file mode 100644
index a1f16ff89b9010ddd59fa38d563599c76427989a..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * M I N I M A L I S T I C T M R M G R E N T I T Y *
- * *
- * Copyright (C) 2010 Amit Chawre. *
- * *
- *----------------------------------------------------------------------------*/
-
-
-/**
- * @file NwMiniTmrMgrEntity.c
- * @brief This file ontains example of a minimalistic timer manager entity.
-*/
-
-#include <stdio.h>
-#include <assert.h>
-#include "NwEvt.h"
-#include "NwLog.h"
-
-#ifndef __NW_MINI_TMR_MGR_H__
-#define __NW_MINI_TMR_MGR_H__
-
-#ifndef NW_ASSERT
-#define NW_ASSERT assert
-#endif
-
-typedef struct {
- NwEventT ev;
- void* timeoutArg;
-} NwMiniTmrMgrEntityT;
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-NwGtpv1uRcT nwTimerStart( NwGtpv1uTimerMgrHandleT tmrMgrHandle,
- uint32_t timeoutSec,
- uint32_t timeoutUsec,
- uint32_t tmrType,
- void* timeoutArg,
- NwGtpv1uTimerHandleT* hTmr);
-
-
-NwGtpv1uRcT nwTimerStop( NwGtpv1uTimerMgrHandleT tmrMgrHandle,
- NwGtpv1uTimerHandleT hTmr);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.c b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.c
deleted file mode 100644
index a63b02985c51335e328226e18c2bb2d42874659f..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * M I N I M A L I S T I C U D P E N T I T Y *
- * *
- * Copyright (C) 2010 Amit Chawre. *
- * *
- *----------------------------------------------------------------------------*/
-
-
-/**
- * @file NwMiniUdpEntity.c
- * @brief This file contains example of a minimalistic ULP entity.
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include "NwEvt.h"
-#include "NwGtpv1u.h"
-#include "NwMiniLogMgrEntity.h"
-#include "NwMiniUdpEntity.h"
-
-#ifndef NW_ASSERT
-#define NW_ASSERT assert
-#endif
-
-#define MAX_UDP_PAYLOAD_LEN (4096)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*---------------------------------------------------------------------------
- * Private functions
- *--------------------------------------------------------------------------*/
-
-static
-void NW_TMR_CALLBACK(nwUdpDataIndicationCallbackData)
-{
- NwGtpv1uRcT rc;
- uint8_t udpBuf[MAX_UDP_PAYLOAD_LEN];
- NwS32T bytesRead;
- uint32_t peerLen;
- struct sockaddr_in peer;
- NwMiniUdpEntityT *thiz = (NwMiniUdpEntityT *) arg;
-
- peerLen = sizeof(peer);
-
- bytesRead = recvfrom(thiz->hSocket, udpBuf, MAX_UDP_PAYLOAD_LEN , 0,
- (struct sockaddr *) &peer,(socklen_t *) &peerLen);
-
- if(bytesRead) {
- NW_LOG(NW_LOG_LEVEL_DEBG, "Received UDP message of length %u from %X:%u",
- bytesRead, ntohl(peer.sin_addr.s_addr), ntohs(peer.sin_port));
- rc = nwGtpv1uProcessUdpReq(thiz->hGtpv1uStack, udpBuf, bytesRead,
- peer.sin_port, peer.sin_addr.s_addr);
- } else {
- NW_LOG(NW_LOG_LEVEL_ERRO, "%s", strerror(errno));
- }
-}
-
-
-/*---------------------------------------------------------------------------
- * Public functions
- *--------------------------------------------------------------------------*/
-
-NwGtpv1uRcT nwMiniUdpInit(NwMiniUdpEntityT *thiz,
- NwGtpv1uStackHandleT hGtpv1uStack, uint8_t *ipAddr)
-{
- int sd;
- struct sockaddr_in addr;
-
- sd = socket(AF_INET, SOCK_DGRAM, 0);
-
- if (sd < 0) {
- NW_LOG(NW_LOG_LEVEL_ERRO, "%s", strerror(errno));
- NW_ASSERT(0);
- }
-
- addr.sin_family = AF_INET;
- addr.sin_port = htons(2152);
- addr.sin_addr.s_addr = inet_addr(ipAddr);
- memset(addr.sin_zero, '\0', sizeof (addr.sin_zero));
-
- if(bind(sd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- NW_LOG(NW_LOG_LEVEL_ERRO, "%s", strerror(errno));
- NW_ASSERT(0);
- }
-
- event_set(&(thiz->ev), sd, EV_READ|EV_PERSIST, nwUdpDataIndicationCallbackData,
- thiz);
- event_add(&(thiz->ev), NULL);
-
- thiz->hSocket = sd;
- thiz->hGtpv1uStack = hGtpv1uStack;
-
- return NW_GTPV1U_OK;
-}
-
-NwGtpv1uRcT nwMiniUdpDestroy(NwMiniUdpEntityT *thiz)
-{
- close(thiz->hSocket);
-}
-
-NwGtpv1uRcT nwMiniUdpDataReq(NwGtpv1uUdpHandleT udpHandle,
- uint8_t *dataBuf,
- uint32_t dataSize,
- uint32_t peerIpAddr,
- uint32_t peerPort)
-{
- struct sockaddr_in peerAddr;
- NwS32T bytesSent;
- NwMiniUdpEntityT *thiz = (NwMiniUdpEntityT *) udpHandle;
-
- peerAddr.sin_family = AF_INET;
- peerAddr.sin_port = htons(peerPort);
- peerAddr.sin_addr.s_addr = (peerIpAddr);
- memset(peerAddr.sin_zero, '\0', sizeof (peerAddr.sin_zero));
-
- NW_LOG(NW_LOG_LEVEL_DEBG,
- "Sending %u bytes on handle 0x%x to peer %u.%u.%u.%u:%u", dataSize, udpHandle,
- (peerIpAddr & 0x000000ff),
- (peerIpAddr & 0x0000ff00) >> 8,
- (peerIpAddr & 0x00ff0000) >> 16,
- (peerIpAddr & 0xff000000) >> 24,
- peerPort);
-
- bytesSent = sendto (thiz->hSocket, dataBuf, dataSize, 0,
- (struct sockaddr *) &peerAddr, sizeof(peerAddr));
-
- if(bytesSent < 0) {
- NW_LOG(NW_LOG_LEVEL_ERRO, "%s", strerror(errno));
- } else {
- NW_LOG(NW_LOG_LEVEL_DEBG, "Sent %u bytes on handle 0x%x to peer %u.%u.%u.%u",
- dataSize, udpHandle,
- (peerIpAddr & 0x000000ff),
- (peerIpAddr & 0x0000ff00) >> 8,
- (peerIpAddr & 0x00ff0000) >> 16,
- (peerIpAddr & 0xff000000) >> 24);
-
- }
-
- return NW_GTPV1U_OK;
-}
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.h b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.h
deleted file mode 100644
index 568c5b07969d596460ead54753b4386201bcbd10..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * M I N I M A L I S T I C U D P E N T I T Y *
- * *
- * Copyright (C) 2010 Amit Chawre. *
- * *
- *----------------------------------------------------------------------------*/
-
-
-/**
- * @file NwMiniUdpEntity.h
- * @brief This file contains example of a minimalistic ULP entity.
-*/
-
-#include <stdio.h>
-#include <assert.h>
-#include "NwEvt.h"
-#include "NwLog.h"
-
-#ifndef __NW_MINI_UDP_ENTITY_H__
-#define __NW_MINI_UDP_ENTITY_H__
-
-#ifndef NW_ASSERT
-#define NW_ASSERT assert
-#endif
-
-typedef struct {
- uint32_t hSocket;
- NwEventT ev;
- NwGtpv1uStackHandleT hGtpv1uStack;
-} NwMiniUdpEntityT;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-NwGtpv1uRcT nwMiniUdpInit(NwMiniUdpEntityT* thiz, NwGtpv1uStackHandleT hGtpv1uStack, uint8_t* ipAddr);
-
-NwGtpv1uRcT nwMiniUdpDestroy(NwMiniUdpEntityT* thiz);
-
-NwGtpv1uRcT nwMiniUdpDataReq(NwGtpv1uUdpHandleT udpHandle,
- uint8_t* dataBuf,
- uint32_t dataSize,
- uint32_t peerAddr,
- uint32_t peerPort);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.c b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.c
deleted file mode 100644
index e2f505b4eb22ac655a9028d54646a106fbf2238b..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * M I N I M A L I S T I C U L P E N T I T Y *
- * *
- * Copyright (C) 2010 Amit Chawre. *
- * *
- *----------------------------------------------------------------------------*/
-
-/**
- * @file NwMiniUlpEntity.c
- * @brief This file contains example of a minimalistic ULP entity.
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#include "NwEvt.h"
-#include "NwGtpv1u.h"
-#include "NwGtpv1uIe.h"
-#include "NwMiniLogMgrEntity.h"
-#include "NwMiniUlpEntity.h"
-
-#ifndef NW_ASSERT
-#define NW_ASSERT assert
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*---------------------------------------------------------------------------
- * Private Functions
- *--------------------------------------------------------------------------*/
-
-#define MAX_UDP_PAYLOAD_LEN (4096)
-
-NwGtpv1uRcT
-nwMiniUlpSendEchoRequestToPeer(NwMiniUlpEntityT *thiz, uint32_t peerIp)
-{
- NwGtpv1uRcT rc;
- NwGtpv1uUlpApiT ulpReq;
-
- /*
- * Send Message Request to Gtpv1u Stack Instance
- */
-
- ulpReq.apiType = NW_GTPV1U_ULP_API_INITIAL_REQ;
-
- ulpReq.apiInfo.initialReqInfo.hUlpTrxn = (NwGtpv1uUlpTrxnHandleT)thiz;
- ulpReq.apiInfo.initialReqInfo.teid = 0x00;
- ulpReq.apiInfo.initialReqInfo.peerIp = (peerIp);
- ulpReq.apiInfo.initialReqInfo.peerPort = 2152;
-
- /* Send Echo Request*/
-
- rc = nwGtpv1uMsgNew( thiz->hGtpv1uStack,
- NW_TRUE, /* SeqNum flag */
- NW_FALSE,
- NW_FALSE,
- NW_GTP_ECHO_REQ, /* Msg Type */
- 0x00000000UL, /* TEID */
- 0x5678, /* Seq Number */
- 0,
- 0,
- (&ulpReq.hMsg));
-
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- rc = nwGtpv1uMsgAddIeTV1((ulpReq.hMsg), NW_GTPV1U_IE_RECOVERY,
- thiz->restartCounter);
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- rc = nwGtpv1uProcessUlpReq(thiz->hGtpv1uStack, &ulpReq);
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- return NW_GTPV1U_OK;
-}
-
-static
-void NW_EVT_CALLBACK(nwMiniUlpDataIndicationCallbackData)
-{
- NwMiniUlpEntityT *thiz = (NwMiniUlpEntityT *) arg;
- NwGtpv1uRcT rc;
- uint8_t udpBuf[MAX_UDP_PAYLOAD_LEN];
- NwS32T bytesRead;
- uint32_t peerLen;
- struct sockaddr_in peer;
-
- peerLen = sizeof(peer);
-
- bytesRead = recvfrom(thiz->hSocket, udpBuf, MAX_UDP_PAYLOAD_LEN , 0,
- (struct sockaddr *) &peer,(socklen_t *) &peerLen);
-
- if(bytesRead) {
- NW_LOG(NW_LOG_LEVEL_DEBG, "Received UDP message of length %u from %X:%u",
- bytesRead, ntohl(peer.sin_addr.s_addr), ntohs(peer.sin_port));
- rc = nwMiniUlpTpduSend(thiz, udpBuf, bytesRead, thiz->localPort[fd]);
- } else {
- NW_LOG(NW_LOG_LEVEL_ERRO, "%s", strerror(errno));
- }
-}
-
-/*---------------------------------------------------------------------------
- * Public Functions
- *--------------------------------------------------------------------------*/
-
-NwGtpv1uRcT
-nwMiniUlpInit(NwMiniUlpEntityT *thiz, NwGtpv1uStackHandleT hGtpv1uStack)
-{
- NwGtpv1uRcT rc;
- thiz->hGtpv1uStack = hGtpv1uStack;
-
- return NW_GTPV1U_OK;
-}
-
-NwGtpv1uRcT
-nwMiniUlpDestroy(NwMiniUlpEntityT *thiz)
-{
- NW_ASSERT(thiz);
- memset(thiz, 0, sizeof(NwMiniUlpEntityT));
- return NW_GTPV1U_OK;
-}
-
-NwGtpv1uRcT
-nwMiniUlpCreateConn(NwMiniUlpEntityT *thiz, char *localIpStr, uint16_t localport,
- char *peerIpStr)
-{
- NwGtpv1uRcT rc;
- int sd;
- struct sockaddr_in addr;
- NwGtpv1uUlpApiT ulpReq;
-
- strcpy(thiz->peerIpStr, peerIpStr);
-
- /*
- * Create local tunnel endpoint
- */
-
- NW_LOG(NW_LOG_LEVEL_NOTI, "Creating tunnel endpoint with teid %d", localport);
- ulpReq.apiType =
- NW_GTPV1U_ULP_API_CREATE_TUNNEL_ENDPOINT;
- ulpReq.apiInfo.createTunnelEndPointInfo.teid = localport;
- ulpReq.apiInfo.createTunnelEndPointInfo.hUlpSession =
- (NwGtpv1uUlpSessionHandleT)thiz;
-
- rc = nwGtpv1uProcessUlpReq(thiz->hGtpv1uStack, &ulpReq);
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- thiz->hGtpv1uConn = ulpReq.apiInfo.createTunnelEndPointInfo.hStackSession;
-
- /*
- * Create local udp listening endpoint
- */
-
- sd = socket(AF_INET, SOCK_DGRAM, 0);
-
- if (sd < 0) {
- NW_LOG(NW_LOG_LEVEL_ERRO, "%s", strerror(errno));
- NW_ASSERT(0);
- }
-
- addr.sin_family = AF_INET;
- addr.sin_port = htons(localport);
- addr.sin_addr.s_addr = inet_addr(localIpStr);
- memset(addr.sin_zero, '\0', sizeof (addr.sin_zero));
-
- if(bind(sd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- NW_LOG(NW_LOG_LEVEL_ERRO, "%s", strerror(errno));
- NW_ASSERT(0);
- }
-
- event_set(&(thiz->ev[sd]), sd, EV_READ|EV_PERSIST,
- nwMiniUlpDataIndicationCallbackData, thiz);
- event_add(&(thiz->ev[sd]), NULL);
-
- thiz->localPort[sd] = localport;
-
- /*
- * Create local udp for sendign data
- */
-
- sd = socket(AF_INET, SOCK_DGRAM, 0);
-
- if (sd < 0) {
- NW_LOG(NW_LOG_LEVEL_ERRO, "%s", strerror(errno));
- NW_ASSERT(0);
- }
-
-
- thiz->hSocket = sd;
- return NW_GTPV1U_OK;
-}
-
-NwGtpv1uRcT
-nwMiniUlpDestroyConn(NwMiniUlpEntityT *thiz)
-{
- NwGtpv1uRcT rc;
- NwGtpv1uUlpApiT ulpReq;
- /*---------------------------------------------------------------------------
- * Send Destroy Session Request to GTPv1u Stack Instance
- *--------------------------------------------------------------------------*/
-
- ulpReq.apiType = NW_GTPV1U_ULP_API_DESTROY_TUNNEL_ENDPOINT;
- ulpReq.apiInfo.destroyTunnelEndPointInfo.hStackSessionHandle = thiz->hGtpv1uConn;
-
- rc = nwGtpv1uProcessUlpReq(thiz->hGtpv1uStack, &ulpReq);
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- thiz->hGtpv1uConn = 0;
-
- return NW_GTPV1U_OK;
-}
-
-
-NwGtpv1uRcT
-nwMiniUlpTpduSend(NwMiniUlpEntityT *thiz, uint8_t *tpduBuf, uint32_t tpduLen ,
- uint16_t fromPort)
-{
- NwGtpv1uRcT rc;
- NwGtpv1uUlpApiT ulpReq;
-
- /*
- * Send Message Request to GTPv1u Stack Instance
- */
-
- ulpReq.apiType = NW_GTPV1U_ULP_API_SEND_TPDU;
- ulpReq.apiInfo.sendtoInfo.teid = fromPort;
- ulpReq.apiInfo.sendtoInfo.ipAddr = inet_addr(thiz->peerIpStr);
-
- rc = nwGtpv1uGpduMsgNew( thiz->hGtpv1uStack,
- fromPort,
- NW_FALSE,
- thiz->seqNum++,
- tpduBuf,
- tpduLen,
- &(ulpReq.apiInfo.sendtoInfo.hMsg));
-
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- rc = nwGtpv1uProcessUlpReq(thiz->hGtpv1uStack, &ulpReq);
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- rc = nwGtpv1uMsgDelete(thiz->hGtpv1uStack, (ulpReq.apiInfo.sendtoInfo.hMsg));
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- return NW_GTPV1U_OK;
-}
-
-NwGtpv1uRcT
-nwMiniUlpProcessStackReqCallback (NwGtpv1uUlpHandleT hUlp,
- NwGtpv1uUlpApiT *pUlpApi)
-{
- NwMiniUlpEntityT *thiz;
- NW_ASSERT(pUlpApi != NULL);
-
- thiz = (NwMiniUlpEntityT *) hUlp;
-
- switch(pUlpApi->apiType) {
- case NW_GTPV1U_ULP_API_RECV_TPDU: {
- struct sockaddr_in peerAddr;
- NwS32T bytesSent;
- uint8_t dataBuf[4096];
- uint32_t dataSize;
- uint32_t peerIpAddr = (inet_addr(thiz->peerIpStr));
-
- NW_ASSERT( NW_GTPV1U_OK == nwGtpv1uMsgGetTpdu(pUlpApi->apiInfo.recvMsgInfo.hMsg,
- dataBuf, &dataSize) );
-
- NW_LOG(NW_LOG_LEVEL_DEBG, "Received TPDU from gtpv1u stack %u!",
- pUlpApi->apiInfo.recvMsgInfo.teid);
-
- peerAddr.sin_family = AF_INET;
- peerAddr.sin_port = htons(pUlpApi->apiInfo.recvMsgInfo.teid);
- peerAddr.sin_addr.s_addr = (peerIpAddr);
- memset(peerAddr.sin_zero, '\0', sizeof (peerAddr.sin_zero));
-
- bytesSent = sendto (thiz->hSocket, dataBuf, dataSize, 0,
- (struct sockaddr *) &peerAddr, sizeof(peerAddr));
-
- if(bytesSent < 0) {
- NW_LOG(NW_LOG_LEVEL_ERRO, "%s", strerror(errno));
- NW_ASSERT(0);
- } else {
- NW_LOG(NW_LOG_LEVEL_DEBG, "Sent %u bytes to peer %u.%u.%u.%u", dataSize,
- (peerIpAddr & 0x000000ff),
- (peerIpAddr & 0x0000ff00) >> 8,
- (peerIpAddr & 0x00ff0000) >> 16,
- (peerIpAddr & 0xff000000) >> 24);
- }
-
- NW_ASSERT(nwGtpv1uMsgDelete(thiz->hGtpv1uStack,
- (pUlpApi->apiInfo.recvMsgInfo.hMsg)) == NW_GTPV1U_OK);
-
- }
- break;
-
- default:
- NW_LOG(NW_LOG_LEVEL_WARN, "Received undefined UlpApi (%d) from gtpv1u stack!",
- pUlpApi->apiType);
- }
-
- return NW_GTPV1U_OK;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.h b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.h
deleted file mode 100644
index dd55e8ed7c86b23db27e0c4cf42bf49ed089b0ac..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * M I N I M A L I S T I C U L P E N T I T Y *
- * *
- * Copyright (C) 2010 Amit Chawre. *
- * *
- *----------------------------------------------------------------------------*/
-
-/**
- * @file NwMiniUlpEntity.h
- * @brief This file contains example of a minimalistic ULP entity.
-*/
-
-#include <stdio.h>
-#include <assert.h>
-#include "NwEvt.h"
-#include "NwLog.h"
-
-#ifndef __NW_MINI_ULP_H__
-#define __NW_MINI_ULP_H__
-
-typedef struct {
- int hSocket;
- uint16_t seqNum;
- uint8_t restartCounter;
- uint8_t localIpStr[16];
- uint8_t peerIpStr[16];
- uint32_t localPort[1025];
- NwEventT ev[1025];
- NwGtpv1uStackHandleT hGtpv1uStack;
- NwGtpv1uStackSessionHandleT hGtpv1uConn;
-} NwMiniUlpEntityT;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-NwGtpv1uRcT
-nwMiniUlpInit(NwMiniUlpEntityT* thiz, NwGtpv1uStackHandleT hGtpv1uStack);
-
-NwGtpv1uRcT
-nwMiniUlpDestroy(NwMiniUlpEntityT* thiz);
-
-NwGtpv1uRcT
-nwMiniUlpCreateConn(NwMiniUlpEntityT* thiz, char* localIpStr, uint16_t localPort, char* peerIpStr);
-
-NwGtpv1uRcT
-nwMiniUlpDestroyConn(NwMiniUlpEntityT* thiz);
-
-NwGtpv1uRcT
-nwMiniUlpSendMsg(NwMiniUlpEntityT* thiz);
-
-NwGtpv1uRcT
-nwMiniUlpTpduSend(NwMiniUlpEntityT* thiz, uint8_t* tpduBuf, uint32_t tpduLen , uint16_t fromPort);
-
-NwGtpv1uRcT
-nwMiniUlpProcessStackReqCallback (NwGtpv1uUlpHandleT hUlp,
- NwGtpv1uUlpApiT *pUlpApi);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/helloworld.c b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/helloworld.c
deleted file mode 100644
index 2f618ad64237240333fbebb900ab27c6278e316d..0000000000000000000000000000000000000000
--- a/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/helloworld.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*----------------------------------------------------------------------------*
- * *
- * n w - g t p v 2 u *
- * G P R S T u n n e l i n g P r o t o c o l v 2 u S t a c k *
- * *
- * M I N I M A L I S T I C D E M O N S T R A T I O N *
- * *
- * Copyright (C) 2010 Amit Chawre. *
- * *
- *----------------------------------------------------------------------------*/
-
-
-/**
- * @file hello-world.c
- * @brief This is a test program demostrating usage of nw-gtpv2 library.
-*/
-
-#include <stdio.h>
-#include <assert.h>
-#include "NwEvt.h"
-#include "NwGtpv1u.h"
-
-#include "NwMiniLogMgrEntity.h"
-#include "NwMiniTmrMgrEntity.h"
-#include "NwMiniUdpEntity.h"
-#include "NwMiniUlpEntity.h"
-
-#ifndef NW_ASSERT
-#define NW_ASSERT assert
-#endif
-
-/*---------------------------------------------------------------------------
- * T H E M A I N F U N C T I O N
- *--------------------------------------------------------------------------*/
-
-int main(int argc, char *argv[])
-{
- NwGtpv1uRcT rc;
- char *logLevelStr;
- uint32_t logLevel;
- uint32_t num_of_connections;
-
- NwGtpv1uStackHandleT hGtpv1uStack = 0;
- NwMiniUlpEntityT ulpObj;
- NwMiniUdpEntityT udpObj;
- NwMiniLogMgrT logObj;
- NwGtpv1uUlpEntityT ulp;
- NwGtpv1uUdpEntityT udp;
- NwGtpv1uTimerMgrEntityT tmrMgr;
- NwGtpv1uLogMgrEntityT logMgr;
-
- if(argc != 4) {
- printf("Usage: %s <num-of-connections> <local-ip> <peer-ip>\n", argv[0]);
- exit(0);
- }
-
-
- logLevelStr = getenv ("NW_LOG_LEVEL");
-
- if(logLevelStr == NULL) {
- logLevel = NW_LOG_LEVEL_INFO;
- } else {
- if(strncmp(logLevelStr, "EMER",4) == 0) {
- logLevel = NW_LOG_LEVEL_EMER;
- } else if(strncmp(logLevelStr, "ALER",4) == 0) {
- logLevel = NW_LOG_LEVEL_ALER;
- } else if(strncmp(logLevelStr, "CRIT",4) == 0) {
- logLevel = NW_LOG_LEVEL_CRIT;
- } else if(strncmp(logLevelStr, "ERRO",4) == 0) {
- logLevel = NW_LOG_LEVEL_ERRO ;
- } else if(strncmp(logLevelStr, "WARN",4) == 0) {
- logLevel = NW_LOG_LEVEL_WARN;
- } else if(strncmp(logLevelStr, "NOTI",4) == 0) {
- logLevel = NW_LOG_LEVEL_NOTI;
- } else if(strncmp(logLevelStr, "INFO",4) == 0) {
- logLevel = NW_LOG_LEVEL_INFO;
- } else if(strncmp(logLevelStr, "DEBG",4) == 0) {
- logLevel = NW_LOG_LEVEL_DEBG;
- }
- }
-
- /*---------------------------------------------------------------------------
- * Initialize event library
- *--------------------------------------------------------------------------*/
-
- NW_EVT_INIT();
-
- /*---------------------------------------------------------------------------
- * Initialize Log Manager
- *--------------------------------------------------------------------------*/
-
- nwMiniLogMgrInit(&logObj, logLevel);
-
- /*---------------------------------------------------------------------------
- * Create GTPv1u Stack Instance
- *--------------------------------------------------------------------------*/
-
- rc = nwGtpv1uInitialize(&hGtpv1uStack, GTPU_STACK_ENB);
-
- if(rc != NW_GTPV1U_OK) {
- NW_LOG(NW_LOG_LEVEL_ERRO,
- "Failed to create gtpv1u stack instance. Error '%u' occured", rc);
- exit(1);
- }
-
- NW_LOG(NW_LOG_LEVEL_INFO, "Gtpv1u Stack Handle '%X' Creation Successful!",
- hGtpv1uStack);
-
- /*---------------------------------------------------------------------------
- * Set up Ulp Entity
- *--------------------------------------------------------------------------*/
-
- rc = nwMiniUlpInit(&ulpObj, hGtpv1uStack);
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- ulp.hUlp = (NwGtpv1uUlpHandleT) &ulpObj;
- ulp.ulpReqCallback = nwMiniUlpProcessStackReqCallback;
-
- rc = nwGtpv1uSetUlpEntity(hGtpv1uStack, &ulp);
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
-
- /*---------------------------------------------------------------------------
- * Set up Udp Entity
- *--------------------------------------------------------------------------*/
-
- rc = nwMiniUdpInit(&udpObj, hGtpv1uStack, (argv[2]));
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- udp.hUdp = (NwGtpv1uUdpHandleT) &udpObj;
- udp.udpDataReqCallback = nwMiniUdpDataReq;
-
- rc = nwGtpv1uSetUdpEntity(hGtpv1uStack, &udp);
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- /*---------------------------------------------------------------------------
- * Set up Log Entity
- *--------------------------------------------------------------------------*/
-
- tmrMgr.tmrMgrHandle = 0;
- tmrMgr.tmrStartCallback = nwTimerStart;
- tmrMgr.tmrStopCallback = nwTimerStop;
-
- rc = nwGtpv1uSetTimerMgrEntity(hGtpv1uStack, &tmrMgr);
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- /*---------------------------------------------------------------------------
- * Set up Log Entity
- *--------------------------------------------------------------------------*/
-
- logMgr.logMgrHandle = (NwGtpv1uLogMgrHandleT) &logObj;
- logMgr.logReqCallback = nwMiniLogMgrLogRequest;
-
- rc = nwGtpv1uSetLogMgrEntity(hGtpv1uStack, &logMgr);
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
- /*---------------------------------------------------------------------------
- * Set GTPv1u log level
- *--------------------------------------------------------------------------*/
-
- rc = nwGtpv1uSetLogLevel(hGtpv1uStack, logLevel);
-
- /*---------------------------------------------------------------------------
- * Send Create Session Request to GTPv1u Stack Instance
- *--------------------------------------------------------------------------*/
-
- num_of_connections = atoi(argv[1]);
-
- while ( num_of_connections-- ) {
- //rc = nwMiniUlpCreateConn(&ulpObj, argv[2], 1234 + num_of_connections, argv[3]);
- rc = nwMiniUlpSendEchoRequestToPeer(&ulpObj, inet_addr(argv[3]));
- NW_ASSERT( rc == NW_GTPV1U_OK );
- }
-
- /*---------------------------------------------------------------------------
- * Event loop
- *--------------------------------------------------------------------------*/
-
- NW_EVT_LOOP();
-
- NW_LOG(NW_LOG_LEVEL_ERRO, "Exit from eventloop, no events to process!");
-
- /*---------------------------------------------------------------------------
- * Send Destroy Session Request to GTPv1u Stack Instance
- *--------------------------------------------------------------------------*/
-
- rc = nwMiniUlpDestroyConn(&ulpObj);
- NW_ASSERT( rc == NW_GTPV1U_OK );
-
-
- /*---------------------------------------------------------------------------
- * Destroy GTPv1u Stack Instance
- *--------------------------------------------------------------------------*/
-
- rc = nwGtpv1uFinalize(hGtpv1uStack);
-
- if(rc != NW_GTPV1U_OK) {
- NW_LOG(NW_LOG_LEVEL_ERRO,
- "Failed to finalize gtpv1u stack instance. Error '%u' occured", rc);
- } else {
- NW_LOG(NW_LOG_LEVEL_INFO, "Gtpv1u Stack Handle '%X' Finalize Successful!",
- hGtpv1uStack);
- }
-
-
- return rc;
-}
diff --git a/openair3/M3AP/m3ap_MCE_generate_messsages.c b/openair3/M3AP/m3ap_MCE_generate_messsages.c
index 8d8c7f385340b82e12416632ee1640d89004a167..4822a09db92891f7d6d5143803b85ab75a1e14a3 100644
--- a/openair3/M3AP/m3ap_MCE_generate_messsages.c
+++ b/openair3/M3AP/m3ap_MCE_generate_messsages.c
@@ -39,7 +39,6 @@
#include "m2ap_itti_messaging.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
@@ -169,14 +168,6 @@ int m2ap_eNB_generate_m2_setup_request(
LOG_W(M2AP,"pdu.present %d\n",pdu.present);
- // MSC_LOG_TX_MESSAGE(
- // MSC_M2AP_eNB,
- // MSC_M2AP_MCE,
- // (const char *)buffer,
- // len,
- // MSC_AS_TIME_FMT" M2_SETUP_REQUEST initiatingMessage MCEname %s",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // m2ap_eNB_data_p->ENBname);
m2ap_eNB_itti_send_sctp_data_req(instance_p, m2ap_eNB_data_p->assoc_id, buffer, len, 0);
@@ -315,8 +306,6 @@ int m2ap_eNB_generate_m2_setup_request(
//
// m2ap_eNB_data_p->state = M2AP_ENB_STATE_READY;
//
-// //MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_ENB, MSC_M2AP_TARGET_ENB, NULL, 0, "0 M2Setup/successfulOutcome assoc_id %u", m2ap_eNB_data_p->assoc_id);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance_p->instance, m2ap_eNB_data_p->assoc_id, buffer, len, 0);
//
// return ret;
@@ -371,11 +360,6 @@ int m2ap_eNB_generate_m2_setup_request(
// return -1;
// }
//
-// //MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_ENB,
-// // MSC_M2AP_TARGET_ENB, NULL, 0,
-// // "0 M2Setup/unsuccessfulOutcome assoc_id %u cause %u value %u",
-// // assoc_id, cause_type, cause_value);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance, assoc_id, buffer, len, 0);
//
// return ret;
@@ -561,8 +545,6 @@ int m2ap_eNB_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_ENB, MSC_M2AP_TARGET_ENB, NULL, 0, "0 X2Handover/initiatingMessage assoc_id %u", m2ap_eNB_data_p->assoc_id);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance_p->instance, m2ap_eNB_data_p->assoc_id, buffer, len, 1);
//
// return ret;
@@ -654,8 +636,6 @@ int m2ap_eNB_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_ENB, MSC_M2AP_TARGET_ENB, NULL, 0, "0 X2Handover/successfulOutcome assoc_id %u", m2ap_eNB_data_p->assoc_id);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance_p->instance, m2ap_eNB_data_p->assoc_id, buffer, len, 1);
//
// return ret;
@@ -716,8 +696,6 @@ int m2ap_eNB_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_ENB, MSC_M2AP_TARGET_ENB, NULL, 0, "0 X2UEContextRelease/initiatingMessage assoc_id %u", m2ap_eNB_data_p->assoc_id);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance_p->instance, m2ap_eNB_data_p->assoc_id, buffer, len, 1);
//
// return ret;
@@ -800,8 +778,6 @@ int m2ap_eNB_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_ENB, MSC_M2AP_TARGET_ENB, NULL, 0, "0 X2HandoverCancel/initiatingMessage assoc_id %u", m2ap_eNB_data_p->assoc_id);
-//
// m2ap_eNB_itti_send_sctp_data_req(instance_p->instance, m2ap_eNB_data_p->assoc_id, buffer, len, 1);
//
// return ret;
diff --git a/openair3/M3AP/m3ap_MCE_handler.c b/openair3/M3AP/m3ap_MCE_handler.c
index 21d10d1b040cbd1b171dfa668bff65e8f8f9ddb8..3da0c00145e65c5cf5eec49a0b70dabdbabf9584 100644
--- a/openair3/M3AP/m3ap_MCE_handler.c
+++ b/openair3/M3AP/m3ap_MCE_handler.c
@@ -44,7 +44,6 @@
//#include "m3ap_MME_interface_management.h"
#include "m3ap_MCE_interface_management.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
diff --git a/openair3/M3AP/m3ap_MCE_interface_management.c b/openair3/M3AP/m3ap_MCE_interface_management.c
index fb5457925838c9f03f80d3ce5b90b798efb95de1..ef26312245b048f1c6ff63ae4949c79b81048230 100644
--- a/openair3/M3AP/m3ap_MCE_interface_management.c
+++ b/openair3/M3AP/m3ap_MCE_interface_management.c
@@ -44,7 +44,6 @@
#include "m3ap_itti_messaging.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
@@ -149,15 +148,7 @@ int MCE_send_MBMS_SESSION_START_RESPONSE(instance_t instance, m3ap_session_start
//
//
// LOG_W(M3AP,"pdu.present %d\n",pdu.present);
-// // MSC_LOG_TX_MESSAGE(
-// // MSC_M3AP_MCE,
-// // MSC_M3AP_MCE,
-// // (const char *)buffer,
-// // len,
-// // MSC_AS_TIME_FMT" M3_SETUP_REQUEST initiatingMessage MCEname %s",
-// // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
-// // m3ap_MCE_data_p->MCEname);
-//
+
m3ap_MCE_itti_send_sctp_data_req(instance, m3ap_mce_data_g->assoc_id, buffer, len, 0);
return 0;
}
@@ -318,14 +309,6 @@ int MCE_send_MBMS_SESSION_STOP_RESPONSE(instance_t instance, m3ap_session_start_
LOG_D(M3AP,"pdu.present %d\n",pdu.present);
- // MSC_LOG_TX_MESSAGE(
- // MSC_M3AP_MCE,
- // MSC_M3AP_MCE,
- // (const char *)buffer,
- // len,
- // MSC_AS_TIME_FMT" M3_SETUP_REQUEST initiatingMessage MCEname %s",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // m3ap_MCE_data_p->MCEname);
m3ap_MCE_itti_send_sctp_data_req(instance, m3ap_mce_data_g->assoc_id, buffer, len, 0);
return 0;
@@ -425,14 +408,6 @@ int MCE_send_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance, m3ap_mbms_session
LOG_D(M3AP,"pdu.present %d\n",pdu.present);
- // MSC_LOG_TX_MESSAGE(
- // MSC_M3AP_MCE,
- // MSC_M3AP_MCE,
- // (const char *)buffer,
- // len,
- // MSC_AS_TIME_FMT" M3_SETUP_REQUEST initiatingMessage MCEname %s",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // m3ap_MCE_data_p->MCEname);
m3ap_MCE_itti_send_sctp_data_req(instance, m3ap_mce_data_g->assoc_id, buffer, len, 0);
return 0;
@@ -646,14 +621,6 @@ int MCE_send_M3_SETUP_REQUEST(m3ap_MCE_instance_t *instance_p, m3ap_MCE_data_t *
//
//
// LOG_W(M3AP,"pdu.present %d\n",pdu.present);
-// // MSC_LOG_TX_MESSAGE(
-// // MSC_M3AP_MCE,
-// // MSC_M3AP_MCE,
-// // (const char *)buffer,
-// // len,
-// // MSC_AS_TIME_FMT" M3_SETUP_REQUEST initiatingMessage MCEname %s",
-// // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
-// // m3ap_MCE_data_p->MCEname);
//
//
//// buffer = &bytes[0];
@@ -725,15 +692,6 @@ int MCE_handle_M3_SETUP_RESPONSE(instance_t instance,
//for (int i=0;i<num_cells_to_activate;i++)
// AssertFatal(M3AP_SETUP_RESP (msg_p).num_SI[i] > 0, "System Information %d is missing",i);
- //MSC_LOG_RX_MESSAGE(
- // MSC_M3AP_MCE,
- // MSC_M3AP_CU,
- // 0,
- // 0,
- // MSC_AS_TIME_FMT" MCE_handle_M3_SETUP_RESPONSE successfulOutcome assoc_id %d",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // assoc_id);
-
//LOG_D(M3AP, "Sending M3AP_SETUP_RESP ITTI message to MCE_APP with assoc_id (%d->%d)\n",
// assoc_id,MCE_MOMCELE_ID_TO_INSTANCE(assoc_id));
itti_send_msg_to_task(TASK_MCE_APP, ENB_MODULE_ID_TO_INSTANCE(assoc_id), msg_p);
diff --git a/openair3/M3AP/m3ap_MME_generate_messages.c b/openair3/M3AP/m3ap_MME_generate_messages.c
index a28097cf1afe014dbc74681c0f5a1fa55b57a71b..969863b4459b29a3308aa5fb8b7fe6ecc5241e44 100644
--- a/openair3/M3AP/m3ap_MME_generate_messages.c
+++ b/openair3/M3AP/m3ap_MME_generate_messages.c
@@ -39,7 +39,6 @@
#include "m2ap_itti_messaging.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
@@ -174,8 +173,6 @@ int m2ap_MCE_generate_m2_setup_request(
return -1;
}
- //MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE, MSC_M2AP_TARGET_MCE, NULL, 0, "0 M2Setup/initiatingMessage assoc_id %u", m2ap_MCE_data_p->assoc_id);
-
m2ap_MCE_itti_send_sctp_data_req(instance_p->instance, m2ap_MCE_data_p->assoc_id, buffer, len, 0);
return ret;
@@ -311,8 +308,6 @@ int m2ap_MCE_generate_m2_setup_response(m2ap_MCE_instance_t *instance_p, m2ap_MC
m2ap_MCE_data_p->state = M2AP_MCE_STATE_READY;
- //MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE, MSC_M2AP_TARGET_MCE, NULL, 0, "0 M2Setup/successfulOutcome assoc_id %u", m2ap_MCE_data_p->assoc_id);
-
m2ap_MCE_itti_send_sctp_data_req(instance_p->instance, m2ap_MCE_data_p->assoc_id, buffer, len, 0);
return ret;
@@ -367,11 +362,6 @@ int m2ap_MCE_generate_m2_setup_failure(instance_t instance,
return -1;
}
- //MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE,
- // MSC_M2AP_TARGET_MCE, NULL, 0,
- // "0 M2Setup/unsuccessfulOutcome assoc_id %u cause %u value %u",
- // assoc_id, cause_type, cause_value);
-
m2ap_MCE_itti_send_sctp_data_req(instance, assoc_id, buffer, len, 0);
return ret;
@@ -557,8 +547,6 @@ int m2ap_MCE_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE, MSC_M2AP_TARGET_MCE, NULL, 0, "0 X2Handover/initiatingMessage assoc_id %u", m2ap_MCE_data_p->assoc_id);
-//
// m2ap_MCE_itti_send_sctp_data_req(instance_p->instance, m2ap_MCE_data_p->assoc_id, buffer, len, 1);
//
// return ret;
@@ -650,8 +638,6 @@ int m2ap_MCE_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE, MSC_M2AP_TARGET_MCE, NULL, 0, "0 X2Handover/successfulOutcome assoc_id %u", m2ap_MCE_data_p->assoc_id);
-//
// m2ap_MCE_itti_send_sctp_data_req(instance_p->instance, m2ap_MCE_data_p->assoc_id, buffer, len, 1);
//
// return ret;
@@ -712,8 +698,6 @@ int m2ap_MCE_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE, MSC_M2AP_TARGET_MCE, NULL, 0, "0 X2UEContextRelease/initiatingMessage assoc_id %u", m2ap_MCE_data_p->assoc_id);
-//
// m2ap_MCE_itti_send_sctp_data_req(instance_p->instance, m2ap_MCE_data_p->assoc_id, buffer, len, 1);
//
// return ret;
@@ -796,8 +780,6 @@ int m2ap_MCE_set_cause (M2AP_Cause_t * cause_p,
// return -1;
// }
//
-// MSC_LOG_TX_MESSAGE (MSC_M2AP_SRC_MCE, MSC_M2AP_TARGET_MCE, NULL, 0, "0 X2HandoverCancel/initiatingMessage assoc_id %u", m2ap_MCE_data_p->assoc_id);
-//
// m2ap_MCE_itti_send_sctp_data_req(instance_p->instance, m2ap_MCE_data_p->assoc_id, buffer, len, 1);
//
// return ret;
diff --git a/openair3/M3AP/m3ap_MME_handler.c b/openair3/M3AP/m3ap_MME_handler.c
index 688e3937e110c4df20dc51cb96843fc9a4e1f607..eaba0e8ef15c69fccf0695220bb15197325cd3f9 100644
--- a/openair3/M3AP/m3ap_MME_handler.c
+++ b/openair3/M3AP/m3ap_MME_handler.c
@@ -43,7 +43,6 @@
#include "m3ap_MME_interface_management.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
diff --git a/openair3/M3AP/m3ap_MME_interface_management.c b/openair3/M3AP/m3ap_MME_interface_management.c
index ccdfa4fc5e73dffbfed5b8cfc781a2533ad03343..fd50e80618285a102173a249deab5a9914a905b9 100644
--- a/openair3/M3AP/m3ap_MME_interface_management.c
+++ b/openair3/M3AP/m3ap_MME_interface_management.c
@@ -296,16 +296,6 @@ int MME_handle_MBMS_SESSION_START_RESPONSE(instance_t instance,
//AssertFatal(MME_MBMS_M3AP_ID!=-1,"MME_MBMS_M3AP_ID was not sent\n");
//AssertFatal(MCE_MBMS_M3AP_ID!=-1,"MCE_MBMS_M3AP_ID was not sent\n");
////M3AP_SESSION_START_RESP(msg_p).
-//// MSC_LOG_RX_MESSAGE(
-//// MSC_M3AP_MME,
-//// MSC_M3AP_MCE,
- // //return 0;
-//// 0,
-//// 0,
-//// MSC_AS_TIME_FMT" MME_handle_M2_SESSION_START_RESPONSE successfulOutcome assoc_id %d",
-//// 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
-//// assoc_id);
-////
// LOG_W(M3AP, "Sending M3AP_SESSION_START_RESP ITTI message to MCE_APP with assoc_id (%d->%d)\n",
// assoc_id,ENB_MODULE_ID_TO_INSTANCE(assoc_id));
itti_send_msg_to_task(TASK_MME_APP, ENB_MODULE_ID_TO_INSTANCE(assoc_id), msg_g);
@@ -434,14 +424,6 @@ int MME_handle_MBMS_SESSION_STOP_RESPONSE(instance_t instance,
//AssertFatal(MME_MBMS_M3AP_ID!=-1,"MME_MBMS_M3AP_ID was not sent\n");
//AssertFatal(MCE_MBMS_M3AP_ID!=-1,"MCE_MBMS_M3AP_ID was not sent\n");
// M3AP_SESSION_STOP_RESP(msg_p).
- // MSC_LOG_RX_MESSAGE(
- // MSC_M3AP_MME,
- // MSC_M3AP_MCE,
- // 0,
- // 0,
- // MSC_AS_TIME_FMT" MME_handle_M2_SESSION_STOP_RESPONSE successfulOutcome assoc_id %d",
- // 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- // assoc_id);
// LOG_D(M3AP, "Sending M3AP_SESSION_START_RESP ITTI message to MCE_APP with assoc_id (%d->%d)\n",
// assoc_id,MCE_MODULE_ID_TO_INSTANCE(assoc_id));
@@ -628,15 +610,6 @@ int MME_handle_M3_SETUP_REQUEST(instance_t instance,
*m3ap_mme_data_from_mce = M3AP_SETUP_REQ(message_p);
//printf("m3ap_mme_data_from_mce->assoc_id %d %d\n",m3ap_mme_data_from_mce->assoc_id,assoc_id);
//
-//// MSC_LOG_TX_MESSAGE(
-//// MSC_M3AP_MME,
-//// MSC_RRC_MCE,
-//// 0,
-//// 0,
-//// MSC_AS_TIME_FMT" MME_handle_M3_SETUP_REQUEST",
-//// 0,0//MSC_AS_TIME_ARGS(ctxt_pP),
-//// );
-////
itti_send_msg_to_task(TASK_MME_APP, ENB_MODULE_ID_TO_INSTANCE(instance), message_p);
// if (num_mbms_available > 0) {
// itti_send_msg_to_task(TASK_MME_APP, MCE_MODULE_ID_TO_INSTANCE(instance), message_p);
@@ -1086,16 +1059,6 @@ int MME_handle_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance,
//AssertFatal(MME_MBMS_M3AP_ID!=-1,"MME_MBMS_M3AP_ID was not sent\n");
//AssertFatal(MCE_MBMS_M3AP_ID!=-1,"MCE_MBMS_M3AP_ID was not sent\n");
////M3AP_SESSION_START_RESP(msg_p).
-//// MSC_LOG_RX_MESSAGE(
-//// MSC_M3AP_MME,
-//// MSC_M3AP_MCE,
- // //return 0;
-//// 0,
-//// 0,
-//// MSC_AS_TIME_FMT" MME_handle_M2_SESSION_START_RESPONSE successfulOutcome assoc_id %d",
-//// 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
-//// assoc_id);
-////
// LOG_W(M3AP, "Sending M3AP_SESSION_START_RESP ITTI message to MCE_APP with assoc_id (%d->%d)\n",
// assoc_id,ENB_MODULE_ID_TO_INSTANCE(assoc_id));
itti_send_msg_to_task(TASK_MME_APP, ENB_MODULE_ID_TO_INSTANCE(assoc_id), msg_g);
diff --git a/openair3/M3AP/m3ap_handler.c b/openair3/M3AP/m3ap_handler.c
index 832aa0dbacc55b9385eb47a00685257b8af2c5ea..583552528bdc2eae85d1d80e3d74b0f73d777ceb 100644
--- a/openair3/M3AP/m3ap_handler.c
+++ b/openair3/M3AP/m3ap_handler.c
@@ -44,7 +44,6 @@
#include "m3ap_MME_interface_management.h"
#include "m3ap_MCE_interface_management.h"
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
diff --git a/openair3/MME_APP/mme_config.c b/openair3/MME_APP/mme_config.c
index 3b4074f5535def13e3e59f224b5d53fadeb779d9..8005b85fd48553ca55452c33d26a04da1d8cc286 100644
--- a/openair3/MME_APP/mme_config.c
+++ b/openair3/MME_APP/mme_config.c
@@ -54,7 +54,6 @@
#include "common/config/config_userapi.h"
#include "RRC_config_tools.h"
#include "enb_paramdef.h"
-#include "proto_agent.h"
int RCconfig_MME(void ) {
//int num_enbs = 0;
diff --git a/openair3/NAS/COMMON/API/NETWORK/nas_message.c b/openair3/NAS/COMMON/API/NETWORK/nas_message.c
index 769eab52609c26425556e8aef61671f737a5e480..d1a9e97025bb59b84617f82e8801e1b6d6ee27cc 100644
--- a/openair3/NAS/COMMON/API/NETWORK/nas_message.c
+++ b/openair3/NAS/COMMON/API/NETWORK/nas_message.c
@@ -1096,7 +1096,8 @@ static int _nas_message_decrypt(
"Unknown security header type %u", security_header_type);
LOG_FUNC_RETURN (0);
};
-
+ LOG_FUNC_RETURN (0);
+
}
/****************************************************************************
diff --git a/openair3/NAS/COMMON/UTIL/nas_timer.c b/openair3/NAS/COMMON/UTIL/nas_timer.c
index 9ccca12520f3c6101ea9b978bb543cf02d4bde5a..8448d9a78cce62155edfc34ab35c266b5bfe6d48 100644
--- a/openair3/NAS/COMMON/UTIL/nas_timer.c
+++ b/openair3/NAS/COMMON/UTIL/nas_timer.c
@@ -46,7 +46,6 @@ Description Timer utilities
#include "intertask_interface.h"
#include "nas_timer.h"
#include "commonDef.h"
-#include "msc.h"
/****************************************************************************/
/**************** E X T E R N A L D E F I N I T I O N S ****************/
diff --git a/openair3/NAS/NR_UE/nr_nas_msg_sim.c b/openair3/NAS/NR_UE/nr_nas_msg_sim.c
index 7cf1378d8b96773baef3b30fba8554e6a6ce1509..283f3b7311d123d13bd18a3c02222574f8a07b85 100644
--- a/openair3/NAS/NR_UE/nr_nas_msg_sim.c
+++ b/openair3/NAS/NR_UE/nr_nas_msg_sim.c
@@ -812,7 +812,6 @@ void *nas_nrue_task(void *args_p)
ue_security_key=(ue_sa_security_key_t **)calloc(1,sizeof(ue_sa_security_key_t*)*NB_UE_INST);
itti_mark_task_ready (TASK_NAS_NRUE);
- MSC_START_USE();
while(1) {
// Wait for a message or an event
diff --git a/openair3/NAS/TEST/AS_SIMULATOR/as_data.h b/openair3/NAS/TEST/AS_SIMULATOR/as_data.h
index 24c64737302d4c843c1c202181f1f8026a4c6d96..9888db69ac604a4c7e3eaa9c6297c4fd1375cfcf 100644
--- a/openair3/NAS/TEST/AS_SIMULATOR/as_data.h
+++ b/openair3/NAS/TEST/AS_SIMULATOR/as_data.h
@@ -47,14 +47,6 @@ Description Defines constants and functions used by the AS simulator
/********************* G L O B A L C O N S T A N T S *******************/
/****************************************************************************/
-/*
- * Constansts used for MSCGEN (Message Sequence Chart Generator)
- */
-#define MSCGEN(args...) fprintf(stderr, ##args);
-#define _ue_id "UE"
-#define _mme_id "MME"
-#define _as_id "AS"
-
/****************************************************************************/
/************************ G L O B A L T Y P E S ************************/
/****************************************************************************/
diff --git a/openair3/NAS/TEST/AS_SIMULATOR/as_process.c b/openair3/NAS/TEST/AS_SIMULATOR/as_process.c
index 21e484e40adbe7c1db70429f678f1f734107c56d..9a9b4da5bb61b261f4c5581d6cdbbc4fdddb8b0f 100644
--- a/openair3/NAS/TEST/AS_SIMULATOR/as_process.c
+++ b/openair3/NAS/TEST/AS_SIMULATOR/as_process.c
@@ -102,7 +102,7 @@ int process_cell_info_req(int msg_id, const cell_info_req_t* req,
index += _process_plmn(_mscgen_buffer, &req->plmnID, MSCGEN_BUFFER_SIZE);
snprintf(_mscgen_buffer + index, MSCGEN_BUFFER_SIZE - index,
", rat = 0x%x%c", req->rat, '\0');
- MSCGEN("[MSC_MSG][%s][%s][--- Cell Information Request (0x%.4x)\\n%s --->][%s]\n",
+ printf("[%s][%s][--- Cell Information Request (0x%.4x)\\n%s --->][%s]\n",
getTime(), _ue_id, msg_id, _mscgen_buffer, _as_id);
/* Setup cell information confirm message */
@@ -116,7 +116,7 @@ int process_cell_info_req(int msg_id, const cell_info_req_t* req,
snprintf(_mscgen_buffer, MSCGEN_BUFFER_SIZE,
"tac = 0x%.4x, cellID = 0x%.8x, rat = 0x%x, RSRQ = %u, RSRP = %u%c",
cnf->tac, cnf->cellID, cnf->rat, cnf->rsrq, cnf->rsrp, '\0');
- MSCGEN("[MSC_MSG][%s][%s][--- Cell Information Confirm (0x%.4x)\\n%s --->][%s]\n",
+ printf("[%s][%s][--- Cell Information Confirm (0x%.4x)\\n%s --->][%s]\n",
getTime(), _as_id, AS_CELL_INFO_CNF, _mscgen_buffer, _ue_id);
printf("INFO\t: %s - Send cell informtion confirm\n", __FUNCTION__);
@@ -146,13 +146,13 @@ int process_nas_establish_req(int msg_id, const nas_establish_req_t* req,
"cause = %s, type = %s, tmsi = {MMEcode = %d, m_tmsi = %u}%c",
rrcCause(req->cause), rrcType(req->type),
req->s_tmsi.MMEcode, req->s_tmsi.m_tmsi, '\0');
- MSCGEN("[MSC_MSG][%s][%s][--- NAS Signalling Connection Establishment Request "
+ printf("[%s][%s][--- NAS Signalling Connection Establishment Request "
"(0x%.4x)\\n%s --->][%s]\n",
getTime(), _ue_id, msg_id, _mscgen_buffer, _as_id);
_process_dump(_mscgen_buffer, MSCGEN_BUFFER_SIZE,
(char*)req->initialNasMsg.data, req->initialNasMsg.length);
- MSCGEN("[MSC_RBOX][%s][%s][%s]\n", _ue_id, _as_id, _mscgen_buffer);
+ printf("[%s][%s][%s]\n", _ue_id, _as_id, _mscgen_buffer);
/* Process initial NAS message */
bytes = nas_process(_mscgen_buffer, MSCGEN_BUFFER_SIZE,
@@ -160,7 +160,7 @@ int process_nas_establish_req(int msg_id, const nas_establish_req_t* req,
req->initialNasMsg.length);
if (bytes < 0) {
- MSCGEN("[MSC_MSG][%s][%s][--- NAS Signalling Connection Establishment "
+ printf("[%s][%s][--- NAS Signalling Connection Establishment "
"Indication (0x%.4x)\\ntac = 0x%.4x\\n%s ---x][%s]\n", getTime(),
_as_id, AS_NAS_ESTABLISH_IND, ind->tac, _mscgen_buffer, _mme_id);
/* Setup NAS signalling connection establishment confirmation message */
@@ -190,7 +190,7 @@ int process_nas_establish_req(int msg_id, const nas_establish_req_t* req,
// Transmission failure of Attach Request message
//cnf->errCode = AS_FAILURE; // UE DEBUG
- MSCGEN("[MSC_MSG][%s][%s][--- NAS Signalling Connection Establishment Indication "
+ printf("[%s][%s][--- NAS Signalling Connection Establishment Indication "
"(0x%.4x)\\nUEid = %u, tac = 0x%.4x\\n%s --->][%s]\n", getTime(),
_as_id, AS_NAS_ESTABLISH_IND, ind->UEid, ind->tac, _mscgen_buffer, _mme_id);
@@ -224,13 +224,13 @@ int process_ul_info_transfer_req(int msg_id, const ul_info_transfer_req_t* req,
snprintf(_mscgen_buffer, MSCGEN_BUFFER_SIZE,
"tmsi = {MMEcode = %d, m_tmsi = %u}%c",
req->s_tmsi.MMEcode, req->s_tmsi.m_tmsi, '\0');
- MSCGEN("[MSC_MSG][%s][%s][--- Uplink Information Request "
+ printf("[%s][%s][--- Uplink Information Request "
"(0x%.4x)\\n%s --->][%s]\n",
getTime(), _ue_id, msg_id, _mscgen_buffer, _as_id);
_process_dump(_mscgen_buffer, MSCGEN_BUFFER_SIZE,
(char*)req->nasMsg.data, req->nasMsg.length);
- MSCGEN("[MSC_RBOX][%s][%s][%s]\n", _ue_id, _as_id, _mscgen_buffer);
+ printf("[%s][%s][%s]\n", _ue_id, _as_id, _mscgen_buffer);
/* Process NAS message */
bytes = nas_process(_mscgen_buffer, MSCGEN_BUFFER_SIZE,
@@ -238,7 +238,7 @@ int process_ul_info_transfer_req(int msg_id, const ul_info_transfer_req_t* req,
req->nasMsg.length);
if (bytes < 0) {
- MSCGEN("[MSC_MSG][%s][%s][--- Uplink Information Indication "
+ printf("[%s][%s][--- Uplink Information Indication "
"(0x%.4x)\\n%s ---x][%s]\n", getTime(),
_as_id, AS_UL_INFO_TRANSFER_IND, _mscgen_buffer, _mme_id);
/* Setup uplink information confirmation message */
@@ -279,7 +279,7 @@ int process_ul_info_transfer_req(int msg_id, const ul_info_transfer_req_t* req,
// cnf->errCode = AS_FAILURE; // UE DEBUG
//}
- MSCGEN("[MSC_MSG][%s][%s][--- Uplink Information Indication "
+ printf("[%s][%s][--- Uplink Information Indication "
"(0x%.4x), UEid = %u\\n%s --->][%s]\n", getTime(),
_as_id, AS_UL_INFO_TRANSFER_IND, ind->UEid, _mscgen_buffer, _mme_id);
@@ -297,7 +297,7 @@ int process_nas_release_req(int msg_id, const nas_release_req_t* req)
printf("INFO\t: %s - Process NAS signalling connection release request\n",
__FUNCTION__);
- MSCGEN("[MSC_MSG][%s][%s][--- NAS Signalling Release Request "
+ printf("[%s][%s][--- NAS Signalling Release Request "
"(0x%.4x), tmsi = {MMEcode = %d, m_tmsi = %u}, "
"cause = %s (%u) --->][%s]\n", getTime(), _ue_id, msg_id,
req->s_tmsi.MMEcode, req->s_tmsi.m_tmsi,
@@ -332,14 +332,14 @@ int process_nas_establish_rsp(int msg_id, const nas_establish_rsp_t* rsp,
//rsp->nasMsg.data[21] = 0xc4; // MME DEBUG (Send ESM status)
//}
- MSCGEN("[MSC_MSG][%s][%s][--- NAS Signalling Connection Establishment "
+ printf("[%s][%s][--- NAS Signalling Connection Establishment "
"Response (0x%.4x)\\nerrCode = %s, UEid = %u --->][%s]\n",
getTime(), _mme_id, msg_id,
rrcErrCode(rsp->errCode), rsp->UEid, _as_id);
_process_dump(_mscgen_buffer, MSCGEN_BUFFER_SIZE,
(char*)rsp->nasMsg.data, rsp->nasMsg.length);
- MSCGEN("[MSC_RBOX][%s][%s][%s]\n", _mme_id, _as_id, _mscgen_buffer);
+ printf("[%s][%s][%s]\n", _mme_id, _as_id, _mscgen_buffer);
// Discard Attach Accept message
//return (0); // UE DEBUG
@@ -350,7 +350,7 @@ int process_nas_establish_rsp(int msg_id, const nas_establish_rsp_t* rsp,
rsp->nasMsg.length);
if (bytes < 0) {
- MSCGEN("[MSC_MSG][%s][%s][--- NAS Signalling Connection Establishment "
+ printf("[%s][%s][--- NAS Signalling Connection Establishment "
"Confirm (0x%.4x)\\n%s ---x][%s]\n", getTime(),
_as_id, AS_NAS_ESTABLISH_CNF, _mscgen_buffer, _ue_id);
return (0);
@@ -369,7 +369,7 @@ int process_nas_establish_rsp(int msg_id, const nas_establish_rsp_t* rsp,
}
}
- MSCGEN("[MSC_MSG][%s][%s][--- NAS Signalling Connection Establishment "
+ printf("[%s][%s][--- NAS Signalling Connection Establishment "
"Confirm (0x%.4x)\\n%s --->][%s]\n", getTime(),
_as_id, AS_NAS_ESTABLISH_CNF, _mscgen_buffer, _ue_id);
@@ -401,13 +401,13 @@ int process_dl_info_transfer_req(int msg_id, const dl_info_transfer_req_t* req,
// req->nasMsg.data[6] = 0x02; // UE DEBUG
//}
- MSCGEN("[MSC_MSG][%s][%s][--- Downlink Information Request "
+ printf("[%s][%s][--- Downlink Information Request "
"(0x%.4x), UEid = %u --->][%s]\n",
getTime(), _mme_id, msg_id, req->UEid, _as_id);
_process_dump(_mscgen_buffer, MSCGEN_BUFFER_SIZE,
(char*)req->nasMsg.data, req->nasMsg.length);
- MSCGEN("[MSC_RBOX][%s][%s][%s]\n", _mme_id, _as_id, _mscgen_buffer);
+ printf("[%s][%s][%s]\n", _mme_id, _as_id, _mscgen_buffer);
/* Process NAS message */
bytes = nas_process(_mscgen_buffer, MSCGEN_BUFFER_SIZE,
@@ -415,7 +415,7 @@ int process_dl_info_transfer_req(int msg_id, const dl_info_transfer_req_t* req,
req->nasMsg.length);
if (bytes < 0) {
- MSCGEN("[MSC_MSG][%s][%s][--- Downlink Information Indication "
+ printf("[%s][%s][--- Downlink Information Indication "
"(0x%.4x)\\n%s ---x][%s]\n", getTime(),
_as_id, AS_DL_INFO_TRANSFER_IND, _mscgen_buffer, _ue_id);
/* Setup downlink information confirmation message */
@@ -445,7 +445,7 @@ int process_dl_info_transfer_req(int msg_id, const dl_info_transfer_req_t* req,
// return (0); // MME DEBUG
//}
- MSCGEN("[MSC_MSG][%s][%s][--- Downlink Information Indication "
+ printf("[%s][%s][--- Downlink Information Indication "
"(0x%.4x)\\n%s --->][%s]\n", getTime(),
_as_id, AS_DL_INFO_TRANSFER_IND, _mscgen_buffer, _ue_id);
@@ -464,14 +464,14 @@ int process_nas_release_ind(int msg_id, const nas_release_req_t* req,
printf("INFO\t: %s - Process NAS signalling connection release request\n",
__FUNCTION__);
- MSCGEN("[MSC_MSG][%s][%s][--- NAS Signalling Connection Release Request "
+ printf("[%s][%s][--- NAS Signalling Connection Release Request "
"(0x%.4x), UEid = %u, cause = %s (%u) --->][%s]\n",
getTime(), _mme_id, msg_id, req->UEid,
rrcReleaseCause(req->cause), req->cause, _as_id);
/* Forward NAS release indication to the UE */
ind->cause = req->cause;
- MSCGEN("[MSC_MSG][%s][%s][--- NAS Signalling Connection Release Indication "
+ printf("[%s][%s][--- NAS Signalling Connection Release Indication "
"(0x%.4x), cause = %s (%u) --->][%s]\n",
getTime(), _as_id, msg_id, rrcReleaseCause(req->cause),
ind->cause, _ue_id);
diff --git a/openair3/NAS/TEST/AS_SIMULATOR/as_simulator.c b/openair3/NAS/TEST/AS_SIMULATOR/as_simulator.c
index efe2c1af72b567b0e84508f13711fe8065c71126..bbc37d18a3caaa3380a32c081f6afa3a0a10bd6a 100644
--- a/openair3/NAS/TEST/AS_SIMULATOR/as_simulator.c
+++ b/openair3/NAS/TEST/AS_SIMULATOR/as_simulator.c
@@ -193,7 +193,7 @@ int main (int argc, const char* argv[])
printf("INFO\t: %s - The RRC Simulator is now connected to %s/%s (%d)\n",
__FUNCTION__, mhost, mport, socket_get_fd(_as_simulator_mme_sid));
- MSCGEN("[MSC_NEW][%s][AS=%s]\n", getTime(), _as_id);
+ printf("[%s][AS=%s]\n", getTime(), _as_id);
/*
* Set up signal handler
@@ -325,7 +325,7 @@ static void* _as_simulator_ue_mngr(void* args)
printf("INFO\t: %s - UE connection manager started\n", __FUNCTION__);
- MSCGEN("[MSC_NEW][%s][NAS-UE=%s]\n", getTime(), _ue_id);
+ printf("[%s][NAS-UE=%s]\n", getTime(), _ue_id);
/* Receiving loop */
while (_as_simulator_ue_is_running) {
@@ -407,7 +407,7 @@ static void* _as_simulator_mme_mngr(void* args)
printf("INFO\t: %s - MME connection manager started\n", __FUNCTION__);
- MSCGEN("[MSC_NEW][%s][NAS-MME=%s]\n", getTime(), _mme_id);
+ printf("[%s][NAS-MME=%s]\n", getTime(), _mme_id);
/* Receiving loop */
while (_as_simulator_mme_is_running) {
diff --git a/openair3/NAS/TEST/MSC/ActivatePDN.png b/openair3/NAS/TEST/MSC/ActivatePDN.png
deleted file mode 100644
index 7bdfb63d699e306fd53e495fc0b4cc7d13cd98e6..0000000000000000000000000000000000000000
Binary files a/openair3/NAS/TEST/MSC/ActivatePDN.png and /dev/null differ
diff --git a/openair3/NAS/TEST/MSC/AuthenticationReject.png b/openair3/NAS/TEST/MSC/AuthenticationReject.png
deleted file mode 100644
index de5d3ead9db8457be75a1d26a9eb8d73c3d0655b..0000000000000000000000000000000000000000
Binary files a/openair3/NAS/TEST/MSC/AuthenticationReject.png and /dev/null differ
diff --git a/openair3/NAS/TEST/MSC/DeactivatePDN.png b/openair3/NAS/TEST/MSC/DeactivatePDN.png
deleted file mode 100644
index 28401eadea1b6b9de9b311d0bc7d6822272b158d..0000000000000000000000000000000000000000
Binary files a/openair3/NAS/TEST/MSC/DeactivatePDN.png and /dev/null differ
diff --git a/openair3/NAS/TEST/MSC/InitialAttach.png b/openair3/NAS/TEST/MSC/InitialAttach.png
deleted file mode 100644
index 35723a48fe2593974950dcfaee36faffed9518ac..0000000000000000000000000000000000000000
Binary files a/openair3/NAS/TEST/MSC/InitialAttach.png and /dev/null differ
diff --git a/openair3/NAS/TEST/MSC/InitialAttachReject.png b/openair3/NAS/TEST/MSC/InitialAttachReject.png
deleted file mode 100644
index efe658694f10fa535f9ab36d749cdd2594eb66fe..0000000000000000000000000000000000000000
Binary files a/openair3/NAS/TEST/MSC/InitialAttachReject.png and /dev/null differ
diff --git a/openair3/NAS/TEST/MSC/NomalDetach.png b/openair3/NAS/TEST/MSC/NomalDetach.png
deleted file mode 100644
index e5ca319adaa40233cc3e0ac570d547f6ebfa7093..0000000000000000000000000000000000000000
Binary files a/openair3/NAS/TEST/MSC/NomalDetach.png and /dev/null differ
diff --git a/openair3/NAS/TEST/MSC/README b/openair3/NAS/TEST/MSC/README
deleted file mode 100644
index b78a7b3e747a5e24d0072b09aa15c66faf55c680..0000000000000000000000000000000000000000
--- a/openair3/NAS/TEST/MSC/README
+++ /dev/null
@@ -1,34 +0,0 @@
-================================================================================
- Message Sequence Chart generation
-================================================================================
-
-Message Sequence Charts (MSCs) are a way of representing entities and
-interactions to demonstrate how protocols operate between network elements.
-
-The Access Stratum simulator generates MSC description file that can be
-processed by the Python script msc_gen.py to generate a PNG (Portable
-Network Graphic) file.
-
-msc_gen.py use mscgen utility that is fully discribed at
-http://www.mcternan.me.uk/mscgen/
-
---------------------------------------------------------------------------------
- How to generate MSC description file ?
---------------------------------------------------------------------------------
-
-Redirect stderr stream to a file that will be used as input by the Python
-script msc_gen.py:
-
-ASprocess 2> ASprocess.msc
-
---------------------------------------------------------------------------------
- How to generate PNG file ?
---------------------------------------------------------------------------------
-
-Parse the MSC description file using the Python script msc_gen.py:
-
-./msc_gen.py ASprocess.msc
-
-Warning: msc_gen.py needs mscgen utility to be installed. mscgen is a C
-program that uses the GD graphics library for PNG output.
-
diff --git a/openair3/NAS/TEST/MSC/SwitchOffDetach.png b/openair3/NAS/TEST/MSC/SwitchOffDetach.png
deleted file mode 100644
index 77b28c11a52b7f5b8b6af762c6ea7bc3c77c6c93..0000000000000000000000000000000000000000
Binary files a/openair3/NAS/TEST/MSC/SwitchOffDetach.png and /dev/null differ
diff --git a/openair3/NAS/TEST/MSC/msc_gen.py b/openair3/NAS/TEST/MSC/msc_gen.py
deleted file mode 100755
index 2857cddc331d49cbe396e0f41321695c2d4800f2..0000000000000000000000000000000000000000
--- a/openair3/NAS/TEST/MSC/msc_gen.py
+++ /dev/null
@@ -1,354 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-# Lionel GAUTHIER
-# This script is a downgrade of a python script written for the openair stack, generating sequence diagrams charts, displaying
-# messages exchanged between LTE access stratum protocol entities.
-# This script needs mscgen tool (http://www.mcternan.me.uk/mscgen/).
-#
-# The aim of this script is to collect some traces from oaisim stack and generate a mscgen script, then generate a sequence diagram
-# image (png or jpeg) based on the scripts generated.
-# An example of how it can be invoqued: msc_gen.py /tmp/msc_log.txt /tmp/msc_log2.txt msc_logx.txt are input text files,
-# They/It are/is generated by the execution of executables in linux user space. May be it is better to operate on log files 'grepped' with MSC:
-# ./my_exe.exe | grep \[MSC > /tmp/msc_log1.txt
-
-
-# Now, examples of how to generate a mscgen trace in a C executable:
-# -First you have to declare the instance(s) of the protocol(s) that will send or receive messages.
-# This is done with the following line:
-# [MSC_NEW][system time][protocol_name=instance_name]
-# examples:
-# printf("[MSC_NEW][%s][MIH-F=%s]\n", getTimeStamp4Log(), g_mihf_id); for declaring a new instance of a protocol entity of type MIH-F
-# with an instance name g_mihf_id (of type char*)
-# printf("[MSC_NEW][%s][NAS=%s]\n", getTimeStamp4Log(), "nas"); other example.
-# This declaration of instances of protocols is mandatory to for this script to work.
-#
-# -Then for tracing a message you have to log a line following this format:
-# [MSC_MSG][system time][source instance_name][--- message_name --->][destination instance_name]
-# Note:
-# ---> means a message that has been received correctly by destination
-# ---x means a message lost by destination
-# example
-# NOTICE("[MSC_MSG][%s][%s][--- Link_Register.indication\\n%s ---x][%s]\n",getTimeStamp4Log(),g_link_id,g_msc_gen_buf,g_mihf_id);
-#
-
-
-
-
-import sys
-import subprocess
-import re
-import socket
-import datetime
-import os.path
-from datetime import date
-
-MSCGEN_OUTPUT_TYPE = "png"
-MAX_MESSAGES_PER_PAGE = 36
-
-SYSTEM_FRAME_NUMBER_STR = 'FRAME'
-MODULE_STR = 'MOD'
-RADIO_BEARER_STR = 'RB'
-MSC_NEW_STR = '[MSC_NEW]'
-MSC_MSG_STR = '[MSC_MSG]'
-MSC_NBOX_STR = '[MSC_NBOX]'
-MSC_BOX_STR = '[MSC_BOX]'
-MSC_ABOX_STR = '[MSC_ABOX]'
-MSC_RBOX_STR = '[MSC_RBOX]'
-
-# This dic is filled as follow : g_entities_dic[protocol_instance_name].append(protocol_name)
-# where protocol_name can be any of the following MI-USER, MIH-F, RAL, LINK-SAP
-g_entities_dic = {}
-g_reverse_entities_dic = {}
-
-
-# g_messages is filled with dictionnaries:
-# message_dic['entity_src'] = protocol_entity_src
-# message_dic['entity_dst'] = protocol_entity_dest
-# message_dic['msg'] = message
-# message_dic['line_color'] = g_display_color[entity_name]
-# message_dic['text_color'] = g_display_color[entity_name]
-# message_dic['time'] = system_frame_number
-# message_dic['seq_no'] = sequence_number_generator()
-# g_messages.append(message_dic)
-g_messages = []
-g_messages_dic = {}
-
-
-# g_display_order_dic is a dictionnary where the order of the display of entities sharing the same module identifier is hardcoded
-#MAC and PHY valus have to be above num max radio bearer value
-#g_display_order_dic = {'MIH-USER': 0, 'MIH-F': 1, 'RAL': 3, 'NAS': 4}
-g_display_order_dic = {'NAS-UE': 0, 'AS': 1, 'NAS-MME': 3}
-
-# Display color of messages of sending entities
-g_display_color = {'IP': '\"teal\"',
- 'RRC_UE': '\"red\"',
- 'MIH-USER': '\"black\"',
- 'MIH-F': '\"black\"',
- 'RAL': '\"black\"',
- 'RAL_M': '\"black\"',
- 'RLC_UM': '\"navy\"',
- 'RLC_TM': '\"navy\"',
- 'NAS': '\"black\"',
- 'MAC_eNB': '\"indigo\"',
- 'PHY': '\"purple\"',
- 'NAS-UE': '\"black\"',
- 'NAS-MME': '\"black\"',
- 'AS': '\"black\"'}
-
-
-g_final_display_order_list = []
-g_sequence_generator = 0
-
-def sequence_number_generator():
- global g_sequence_generator
- l_seq = g_sequence_generator
- g_sequence_generator = g_sequence_generator + 1
- return l_seq
-
-def parse_log_file_for_discovering_protocol_entities(filename):
- global g_entities_dic
- global g_entities
- global g_messages
- global g_final_display_order_list
- #open TXT file that contain OAI filtered traces for mscgen
-
- fhandle = open(filename, 'r')
- fcontent = fhandle.read()
- fhandle.close()
-
- # split file content in lines
- lines = fcontent.splitlines()
- for line in lines:
- system_time = 'unknown'
-
- # if line is a trace of the creation of a new protocol instance
- if MSC_NEW_STR in line:
- partition = line.rpartition(MSC_NEW_STR)
- msc_log_string = partition[2]
- #print (" %s " % msc_log_string)
- partition = msc_log_string.split('[')
- print ("\n\n %s \n" % partition)
- #if len(partition) == 2:
-
- item = partition[1]
- item = item.strip()
- item = item.strip(']')
- system_time = item.split(' ')[-1]
- print ("NEW system_time %s " % system_time)
-
- item = partition[2]
- item = item.strip()
- item = item.strip(']')
- protocol_entity_type = item.split('=')[0]
- protocol_entity_name = item.split('=')[-1]
- print ("NEW protocol_entity_type %s " % protocol_entity_type)
- print ("NEW protocol_entity_name %s " % protocol_entity_name)
-
- if protocol_entity_name not in g_entities_dic:
- g_entities_dic[protocol_entity_name] = protocol_entity_type
-
- if protocol_entity_type not in g_reverse_entities_dic:
- g_reverse_entities_dic[protocol_entity_type] = protocol_entity_name
- else:
- entity_name_list = g_reverse_entities_dic[protocol_entity_type]
- entity_name_list.append(protocol_entity_name)
- g_reverse_entities_dic[protocol_entity_type] = entity_name_list
- #print (" g_entities_dic[%d][%d].append(%s)" % (module_id_int, radio_bearer_id_int, entity_name_src))
- print (" g_entities_dic= %s\n\n" % (g_entities_dic))
- print (" g_reverse_entities_dic= %s\n\n" % (g_reverse_entities_dic))
-
- #g_entities.append(protocol_entity_type)
- #print (" %s \n" % protocol_entity)
-
-
-
-
-
-def parse_log_file(filename):
- global g_entities_dic
- global g_entities
- global g_messages
- global g_final_display_order_list
- #open TXT file that contain OAI filtered traces for mscgen
- fhandle = open(filename, 'r')
- fcontent = fhandle.read()
- fhandle.close()
-
- # split file content in lines
- lines = fcontent.splitlines()
- for line in lines:
- system_time = 'unknown'
- message = 'unknown'
- entity_name_src = 'unknown'
- entity_name_dest = 'unknown'
-
-
- # if line is a trace of the creation of a new protocol instance
- if MSC_MSG_STR in line:
- partition = line.strip().rpartition(MSC_MSG_STR)
- msc_log_string = partition[2].strip()
- print (" ++++ %s " % msc_log_string)
- partition = msc_log_string.split('[')
- print (" ++++ %s " % partition)
-
- #if len(partition) == 9:
- message_dic = {}
-
- system_time = partition[1].strip().split(' ')[-1].strip(']')
- message_dic['display_time'] = system_time
- seconds_int = int(system_time.split(':')[0])
- micro_seconds_int = int(system_time.split(':')[-1])
- system_time_int = seconds_int*1000000 + micro_seconds_int
- system_time=str(system_time_int)
- print ('system_time %s' % system_time)
-
- entity_name_src = partition[2].strip().split(' ')[-1].strip(']')
- print ('entity_name_src %s' % entity_name_src)
-
- message = partition[3].strip().strip(']').strip()
- if (message[-1] == 'x') or (message[-1] == 'X'):
- message_dic['arc'] = '-x'
- elif message[-1] == '>':
- message_dic['arc'] = '=>'
- message = message.strip('<').strip('>').strip('x').strip('X').strip('-').strip('=').strip()
- print ('message %s' % message)
-
- entity_name_dest = partition[4].strip().split(' ')[-1].strip(']')
- print ('entity_name_dest %s' % entity_name_dest)
- message_dic['entity_src'] = entity_name_src
- message_dic['entity_dst'] = entity_name_dest
- message_dic['msg'] = message
- message_dic['line_color'] = g_display_color[g_entities_dic[entity_name_src]]
- message_dic['text_color'] = g_display_color[g_entities_dic[entity_name_src]]
- message_dic['time'] = system_time
- #message_dic['seq_no'] = sequence_number_generator()
- print ('%s\n\n' % message_dic)
- g_messages_dic[system_time_int] = message_dic
- #g_messages.append(message_dic)
-
-#TODO !!!
- if MSC_RBOX_STR in line:
- partition = line.strip().rpartition(MSC_RBOX_STR)
- msc_log_string = partition[2].strip()
- print (" ==== %s " % msc_log_string)
- partition = msc_log_string.split('[')
- print (" ==== %s " % partition)
-#TODO !!!
-
-def generate_sorted_message_list():
- first_time_stamp = 0
- for system_time_int in sorted(g_messages_dic.iterkeys()):
- if first_time_stamp == 0:
- first_time_stamp = system_time_int
- message_dic = g_messages_dic[system_time_int]
- message_dic['seq_no'] = sequence_number_generator()
- message_dic['display_time'] = str(system_time_int - first_time_stamp)
- g_messages.append(message_dic)
-
-def generate_sorted_entity_display_list():
- module_display_order_dic = {}
- for entity_name in sorted(g_entities_dic.iterkeys()):
- module_display_order_dic[g_display_order_dic[g_entities_dic[entity_name]]] = entity_name
-
-
- print("------------------------------------")
- print(" %s " % (module_display_order_dic))
-
- for display_priority in sorted(module_display_order_dic.iterkeys()):
- g_final_display_order_list.append(module_display_order_dic[display_priority])
-
-def msc_chart_write_header(fileP):
- global g_final_display_order_list
- fileP.write("msc {\n")
- fileP.write("width = \"2048\";\n")
-
- entity_line_list_str = ''
- for entity in g_final_display_order_list:
- entity_line_list_str = entity_line_list_str + ' ' + entity + ','
-
- entity_line_list_str = entity_line_list_str.rstrip().strip(',')
- fileP.write(" %s;" % (entity_line_list_str))
-
-
-def msc_chart_write_footer(fileP):
- fileP.write("\n}\n")
-
-def msc_chart_generate(file_nameP):
- global MSCGEN_OUTPUT_TYPE
- command_line = "mscgen -T " + MSCGEN_OUTPUT_TYPE + " -i " + file_nameP + "; chmod 777 " +file_nameP + ";"
-
- print("Command Line: %s " % (command_line))
- fi,fo,fe=os.popen3(command_line)
- for i in fe.readlines():
- print "error:",i
-
-def get_nem_file_descriptor():
- global g_base_file_name
- global g_page_index
- l_file_name = g_base_file_name + str(g_page_index)+'.txt'
- l_file = open(l_file_name, "w", 0777)
- return l_file
-
-
-###### MAIN START HERE #################
-num_args = len(sys.argv)
-if num_args < 2: # the program name and the arguments
- # stop the program and print an error message
- sys.exit("Must provide at least one file to parse")
-
-for i in range(1,num_args):
- print sys.argv[i]
-
-for i in range(1,num_args):
- parse_log_file_for_discovering_protocol_entities(sys.argv[i])
-
-for i in range(1,num_args):
- parse_log_file(sys.argv[i])
-
-generate_sorted_message_list()
-generate_sorted_entity_display_list()
-
-g_page_index = 0
-g_message_index = 0
-g_message_index_in_current_page = 0
-g_now = datetime.datetime.now()
-g_now_formated = g_now.strftime("%Y-%m-%d_%H.%M.%S")
-g_currentdir = os.curdir
-g_resultdir = os.path.join(g_currentdir, g_now_formated)
-os.mkdir(g_resultdir, 0777)
-os.chdir(g_resultdir)
-
-g_base_file_name = 'mih_mscgen_page_'
-
-g_file = get_nem_file_descriptor()
-msc_chart_write_header(g_file)
-
-for message in g_messages:
-
- if 'msg' in message:
- print ('message %s' % message)
- g_file.write(" %s%s%s [ label = \"(%d) T%s %s\", linecolour=%s , textcolour=%s ] ;\n" % (message['entity_src'], message['arc'], message['entity_dst'], message['seq_no'], message['display_time'], message['msg'], message['line_color'], message['text_color']))
- elif 'box' in message:
- g_file.write(" %s %s %s [ label = \"%s\", textbgcolour=%s , textcolour=%s ] ;\n" % (message['entity_src'], message['box_type'], message['entity_dst'], message['box'], message['textbg_color'], message['text_color']))
-
- g_message_index = g_message_index + 1
- g_message_index_in_current_page = g_message_index_in_current_page + 1
-
- if (g_message_index_in_current_page == MAX_MESSAGES_PER_PAGE):
- msc_chart_write_footer(g_file)
- g_file.close()
- msc_chart_generate(g_file.name)
- g_page_index = g_page_index + 1
- g_message_index_in_current_page = 0
-
- g_file = get_nem_file_descriptor()
- msc_chart_write_header(g_file)
-
-
-msc_chart_write_footer(g_file)
-g_file.close()
-if g_message_index_in_current_page >= 1:
- msc_chart_generate(g_file.name)
-else:
- print("Removing empty seq diagram file: %s " % (g_file.name))
- os.remove(g_file.name)
diff --git a/openair3/NAS/UE/EMM/Detach.c b/openair3/NAS/UE/EMM/Detach.c
index 719e18dd05ba86ba6815c48647357ef8c54c4ef5..b61bcdc14dc7e7ea1d04ff61896ca4db7137d01e 100644
--- a/openair3/NAS/UE/EMM/Detach.c
+++ b/openair3/NAS/UE/EMM/Detach.c
@@ -53,7 +53,6 @@ Description Defines the detach related EMM procedure executed by the
#include "emm_sap.h"
#include "esm_sap.h"
-#include "msc.h"
#include <stdlib.h> // free
diff --git a/openair3/NAS/UE/EMM/Identification.c b/openair3/NAS/UE/EMM/Identification.c
index b5807973a25624f9808c10c12c1ca3e19a4fd306..0364c6d22f2c79797a345aa2596c61e6b67ed1a2 100644
--- a/openair3/NAS/UE/EMM/Identification.c
+++ b/openair3/NAS/UE/EMM/Identification.c
@@ -48,7 +48,6 @@ Description Defines the identification EMM procedure executed by the
#include "emmData.h"
#include "emm_sap.h"
-#include "msc.h"
#include "user_defs.h"
#include <stdlib.h> // malloc, free
diff --git a/openair3/NAS/UE/EMM/SAP/emm_as.c b/openair3/NAS/UE/EMM/SAP/emm_as.c
index 6b226be38061696a5ff4434c91ebcbc50b958497..ea4eefadeba8ffecb1097686de6e984d5f48889f 100644
--- a/openair3/NAS/UE/EMM/SAP/emm_as.c
+++ b/openair3/NAS/UE/EMM/SAP/emm_as.c
@@ -61,7 +61,6 @@ Description Defines the EMMAS Service Access Point that provides
#if defined(NAS_BUILT_IN_UE)
# include "nas_itti_messaging.h"
#endif
-#include "msc.h"
/****************************************************************************/
/**************** E X T E R N A L D E F I N I T I O N S ****************/
diff --git a/openair3/NAS/UE/EMM/SecurityModeControl.c b/openair3/NAS/UE/EMM/SecurityModeControl.c
index b27270fadc43fd89ed7d59d1742b792a30ca953a..f9a02b1a7055a2e502d8fe758c16b101b474d31c 100644
--- a/openair3/NAS/UE/EMM/SecurityModeControl.c
+++ b/openair3/NAS/UE/EMM/SecurityModeControl.c
@@ -63,7 +63,6 @@ Description Defines the security mode control EMM procedure executed by the
# include "assertions.h"
#include "secu_defs.h"
-#include "msc.h"
#include "SecurityModeControl.h"
#if defined(NAS_BUILT_IN_UE)
diff --git a/openair3/NAS/UE/nas_itti_messaging.c b/openair3/NAS/UE/nas_itti_messaging.c
index 8016e0d791757ad2af5555ebaaf92ed540162d5b..c6762a712812dc3cdeb247d08694c3e741920106 100644
--- a/openair3/NAS/UE/nas_itti_messaging.c
+++ b/openair3/NAS/UE/nas_itti_messaging.c
@@ -23,7 +23,6 @@
#include "intertask_interface.h"
#include "nas_itti_messaging.h"
-#include "msc.h"
# define TASK_ORIGIN TASK_NAS_UE
@@ -104,27 +103,6 @@ int nas_itti_kenb_refresh_req(const Byte_t kenb[32], int user_id) {
MessageDef *message_p;
message_p = itti_alloc_new_message(TASK_NAS_UE, 0, NAS_KENB_REFRESH_REQ);
memcpy(NAS_KENB_REFRESH_REQ(message_p).kenb, kenb, sizeof(NAS_KENB_REFRESH_REQ(message_p).kenb));
- MSC_LOG_TX_MESSAGE(
- MSC_NAS_UE,
- MSC_RRC_UE,
- NULL,0,
- "0 NAS_KENB_REFRESH_REQ KeNB "
- "%02x%02x%02x%02x"
- "%02x%02x%02x%02x"
- "%02x%02x%02x%02x"
- "%02x%02x%02x%02x"
- "%02x%02x%02x%02x"
- "%02x%02x%02x%02x"
- "%02x%02x%02x%02x"
- "%02x%02x%02x%02x",
- kenb[0], kenb[1], kenb[2], kenb[3],
- kenb[4], kenb[5], kenb[6], kenb[7],
- kenb[8], kenb[9], kenb[10], kenb[11],
- kenb[12], kenb[13], kenb[14], kenb[15],
- kenb[16], kenb[17], kenb[18], kenb[19],
- kenb[20], kenb[21], kenb[22], kenb[23],
- kenb[24], kenb[25], kenb[26], kenb[27],
- kenb[28], kenb[29], kenb[30], kenb[31]);
return itti_send_msg_to_task(TASK_RRC_UE, NB_eNB_INST + user_id, message_p);
}
@@ -133,13 +111,6 @@ int nas_itti_cell_info_req(const plmn_t plmnID, const Byte_t rat, int user_id) {
message_p = itti_alloc_new_message(TASK_NAS_UE, 0, NAS_CELL_SELECTION_REQ);
NAS_CELL_SELECTION_REQ(message_p).plmnID = plmnID;
NAS_CELL_SELECTION_REQ(message_p).rat = rat;
- MSC_LOG_TX_MESSAGE(
- MSC_NAS_UE,
- MSC_RRC_UE,
- NULL,0,
- "0 NAS_CELL_SELECTION_REQ PLMN %X%X%X.%X%X%X",
- plmnID.MCCdigit1, plmnID.MCCdigit2, plmnID.MCCdigit3,
- plmnID.MNCdigit1, plmnID.MNCdigit2, plmnID.MNCdigit3);
return itti_send_msg_to_task(TASK_RRC_UE, NB_eNB_INST + user_id, message_p);
}
@@ -152,14 +123,6 @@ int nas_itti_nas_establish_req(as_cause_t cause, as_call_type_t type, as_stmsi_t
NAS_CONN_ESTABLI_REQ(message_p).plmnID = plmnID;
NAS_CONN_ESTABLI_REQ(message_p).initialNasMsg.data = data;
NAS_CONN_ESTABLI_REQ(message_p).initialNasMsg.length = length;
- MSC_LOG_TX_MESSAGE(
- MSC_NAS_UE,
- MSC_RRC_UE,
- NULL,0,
- "0 NAS_CONN_ESTABLI_REQ MME code %u m-TMSI %u PLMN %X%X%X.%X%X%X",
- s_tmsi.MMEcode, s_tmsi.m_tmsi,
- plmnID.MCCdigit1, plmnID.MCCdigit2, plmnID.MCCdigit3,
- plmnID.MNCdigit1, plmnID.MNCdigit2, plmnID.MNCdigit3);
return itti_send_msg_to_task(TASK_RRC_UE, NB_eNB_INST + user_id, message_p);
}
@@ -178,11 +141,5 @@ int nas_itti_rab_establish_rsp(const as_stmsi_t s_tmsi, const as_rab_id_t rabID,
NAS_RAB_ESTABLI_RSP(message_p).s_tmsi = s_tmsi;
NAS_RAB_ESTABLI_RSP(message_p).rabID = rabID;
NAS_RAB_ESTABLI_RSP(message_p).errCode = errCode;
- MSC_LOG_TX_MESSAGE(
- MSC_NAS_UE,
- MSC_RRC_UE,
- NULL,0,
- "0 NAS_RAB_ESTABLI_RSP MME code %u m-TMSI %u rb id %u status %u",
- s_tmsi.MMEcode, s_tmsi.m_tmsi,rabID, errCode );
return itti_send_msg_to_task(TASK_RRC_UE, NB_eNB_INST + user_id, message_p);
}
diff --git a/openair3/NAS/UE/nas_itti_messaging.h b/openair3/NAS/UE/nas_itti_messaging.h
index 967bbb30596d9aa200ea96b2e72791659f15049b..79b70394f0e57318070016e2b8806e3360620013 100644
--- a/openair3/NAS/UE/nas_itti_messaging.h
+++ b/openair3/NAS/UE/nas_itti_messaging.h
@@ -26,7 +26,6 @@
#include "assertions.h"
#include "intertask_interface.h"
#include "esm_proc.h"
-#include "msc.h"
#ifndef NAS_ITTI_MESSAGING_H_
#define NAS_ITTI_MESSAGING_H_
diff --git a/openair3/NAS/UE/nas_proc.c b/openair3/NAS/UE/nas_proc.c
index 6312a7dc97225278ca01cd809f16b6186959b74e..9350590788a738a88a11763697e34c15ed44a433 100644
--- a/openair3/NAS/UE/nas_proc.c
+++ b/openair3/NAS/UE/nas_proc.c
@@ -46,7 +46,6 @@ Description NAS procedure call manager
#include "esm_main.h"
#include "esm_sap.h"
-#include "msc.h"
#include <stdio.h> // sprintf
diff --git a/openair3/NAS/UE/nas_ue_task.c b/openair3/NAS/UE/nas_ue_task.c
index 88938c3c376e0aea7614192395e77c794114eebe..a94445349cf648597c913cc44d82583cd7300a8b 100644
--- a/openair3/NAS/UE/nas_ue_task.c
+++ b/openair3/NAS/UE/nas_ue_task.c
@@ -29,12 +29,9 @@
# include "user_api.h"
# include "nas_parser.h"
# include "nas_proc.h"
-# include "msc.h"
# include "memory.h"
#include "nas_user.h"
-#include <common/utils/msc/msc.h>
-
// FIXME make command line option for NAS_UE_AUTOSTART
# define NAS_UE_AUTOSTART 1
@@ -97,7 +94,6 @@ void *nas_ue_task(void *args_p)
nas_user_container_t *users=args_p;
itti_mark_task_ready (TASK_NAS_UE);
- MSC_START_USE();
LOG_I(NAS, "ue_idx_standalone val:: %u\n", ue_idx_standalone);
/* Initialize UE NAS (EURECOM-NAS) */
// Intead of for loop for standalone mode
diff --git a/openair3/NGAP/ngap_common.h b/openair3/NGAP/ngap_common.h
index 283dd2bffa58ae41aca733b9a955053f04bb0bf1..60f7beacd06eb9ef37d86ec705b75e627ea305b3 100644
--- a/openair3/NGAP/ngap_common.h
+++ b/openair3/NGAP/ngap_common.h
@@ -87,6 +87,9 @@
#include "NGAP_PDUSessionResourceModifyItemModReq.h"
#include "NGAP_PDUSessionResourceModifyRequestTransfer.h"
#include "NGAP_QosFlowAddOrModifyRequestItem.h"
+#include "NGAP_PDUSessionResourceModifyResponseTransfer.h"
+#include "NGAP_QosFlowAddOrModifyResponseList.h"
+#include "NGAP_QosFlowAddOrModifyResponseItem.h"
#include "NGAP_TAIListForPagingItem.h"
#include "NGAP_GNB-ID.h"
#include "NGAP_GlobalGNB-ID.h"
diff --git a/openair3/NGAP/ngap_gNB.c b/openair3/NGAP/ngap_gNB.c
index a5dfc88b35c4a6f6a5991a97f2d12f5785b1386c..9d6bd7f07f31f334fcf59b5c34865d90aced2795 100644
--- a/openair3/NGAP/ngap_gNB.c
+++ b/openair3/NGAP/ngap_gNB.c
@@ -57,7 +57,6 @@
#include "ngap_gNB_itti_messaging.h"
#include "ngap_gNB_ue_context.h" // test, to be removed
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
@@ -273,7 +272,6 @@ void ngap_gNB_init(void) {
NGAP_DEBUG("Starting NGAP layer\n");
ngap_gNB_prepare_internal_data();
itti_mark_task_ready(TASK_NGAP);
- MSC_START_USE();
}
void *ngap_gNB_process_itti_msg(void *notUsed) {
diff --git a/openair3/NGAP/ngap_gNB_context_management_procedures.c b/openair3/NGAP/ngap_gNB_context_management_procedures.c
index 73e4498f195d145ac85dd9f599f3a200eb6ecf99..ea22c91bc2a06e67dbc10e87a12d72776a5b65e1 100644
--- a/openair3/NGAP/ngap_gNB_context_management_procedures.c
+++ b/openair3/NGAP/ngap_gNB_context_management_procedures.c
@@ -50,7 +50,6 @@
#include "ngap_gNB_management_procedures.h"
#include "ngap_gNB_context_management_procedures.h"
#include "NGAP_PDUSessionResourceItemCxtRelReq.h"
-#include "msc.h"
int ngap_ue_context_release_complete(instance_t instance,
@@ -116,16 +115,6 @@ int ngap_ue_context_release_complete(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- buffer,
- length,
- MSC_AS_TIME_FMT" UEContextRelease successfulOutcome gNB_ue_ngap_id %u amf_ue_ngap_id %lu",
- 0,0, //MSC_AS_TIME_ARGS(ctxt_pP),
- ue_release_complete_p->gNB_ue_ngap_id,
- ue_context_p->amf_ue_ngap_id);
-
/* UE associated signalling -> use the allocated stream */
ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
ue_context_p->amf_ref->assoc_id, buffer,
@@ -267,16 +256,6 @@ int ngap_ue_context_release_req(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- buffer,
- length,
- MSC_AS_TIME_FMT" UEContextReleaseRequest initiatingMessage gNB_ue_ngap_id %u amf_ue_ngap_id %lu",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_release_req_p->gNB_ue_ngap_id,
- ue_context_p->amf_ue_ngap_id);
-
/* UE associated signalling -> use the allocated stream */
ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
ue_context_p->amf_ref->assoc_id, buffer,
diff --git a/openair3/NGAP/ngap_gNB_handlers.c b/openair3/NGAP/ngap_gNB_handlers.c
index 2b0e8aab7c1251b1a6d069b7d866cf8699612a99..35b152f1298ee2e7ab35fe57a2640e68673740ec 100644
--- a/openair3/NGAP/ngap_gNB_handlers.c
+++ b/openair3/NGAP/ngap_gNB_handlers.c
@@ -48,7 +48,6 @@
#include "assertions.h"
#include "conversions.h"
-#include "msc.h"
#include "NGAP_NonDynamic5QIDescriptor.h"
static
@@ -1208,14 +1207,6 @@ int ngap_gNB_handle_ue_context_release_command(uint32_t assoc_id,
case NGAP_UE_NGAP_IDs_PR_uE_NGAP_ID_pair:
gnb_ue_ngap_id = ie->value.choice.UE_NGAP_IDs.choice.uE_NGAP_ID_pair->rAN_UE_NGAP_ID;
asn_INTEGER2ulong(&(ie->value.choice.UE_NGAP_IDs.choice.uE_NGAP_ID_pair->aMF_UE_NGAP_ID), &amf_ue_ngap_id);
- MSC_LOG_RX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- NULL,0,
- "0 UEContextRelease/%s gNB_ue_ngap_id "NGAP_UE_ID_FMT" amf_ue_ngap_id "NGAP_UE_ID_FMT" len %u",
- ngap_direction2String(pdu->present - 1),
- gnb_ue_ngap_id,
- amf_ue_ngap_id);
if ((ue_desc_p = ngap_gNB_get_ue_context(amf_desc_p->ngap_gNB_instance,
gnb_ue_ngap_id)) == NULL) {
@@ -1225,12 +1216,6 @@ int ngap_gNB_handle_ue_context_release_command(uint32_t assoc_id,
gnb_ue_ngap_id);
return -1;
} else {
- MSC_LOG_TX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_RRC_GNB,
- NULL,0,
- "0 NGAP_UE_CONTEXT_RELEASE_COMMAND/%d gNB_ue_ngap_id "NGAP_UE_ID_FMT" ",
- gnb_ue_ngap_id);
message_p = itti_alloc_new_message(TASK_NGAP, 0, NGAP_UE_CONTEXT_RELEASE_COMMAND);
if (ue_desc_p->amf_ue_ngap_id == 0) { // case of Detach Request and switch off from RRC_IDLE mode
@@ -1629,13 +1614,6 @@ int ngap_gNB_handle_pdusession_modify_request(uint32_t assoc_id,
return -1;
}
- /* PDUSession Resource modify request = UE-related procedure -> stream != 0 */
- if (stream == 0) {
- NGAP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n",
- assoc_id, stream);
- return -1;
- }
-
ue_desc_p->rx_stream = stream;
if (ue_desc_p->amf_ue_ngap_id != amf_ue_ngap_id) {
@@ -1717,14 +1695,20 @@ int ngap_gNB_handle_pdusession_modify_request(uint32_t assoc_id,
switch(pdusessionTransfer_ies->id) {
/* optional PDUSessionAggregateMaximumBitRate */
case NGAP_ProtocolIE_ID_id_PDUSessionAggregateMaximumBitRate:
+ // TODO
+ NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_PDUSessionAggregateMaximumBitRate\n");
break;
/* optional UL-NGU-UP-TNLModifyList */
case NGAP_ProtocolIE_ID_id_UL_NGU_UP_TNLModifyList:
+ // TODO
+ NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_UL_NGU_UP_TNLModifyList\n");
break;
/* optional NetworkInstance */
case NGAP_ProtocolIE_ID_id_NetworkInstance:
+ // TODO
+ NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_NetworkInstance\n");
break;
/* optional QosFlowAddOrModifyRequestList */
@@ -1744,6 +1728,12 @@ int ngap_gNB_handle_pdusession_modify_request(uint32_t assoc_id,
/* Set the QOS informations */
NGAP_PDUSESSION_MODIFY_REQ(message_p).pdusession_modify_params[i].qos[qosIdx].qfi = (uint8_t)qosFlowItem_p->qosFlowIdentifier;
if(qosFlowItem_p->qosFlowLevelQosParameters) {
+ if (qosFlowItem_p->qosFlowLevelQosParameters->qosCharacteristics.present == NGAP_QosCharacteristics_PR_nonDynamic5QI) {
+ NGAP_PDUSESSION_MODIFY_REQ(message_p).pdusession_modify_params[i].qos[qosIdx].fiveQI =
+ qosFlowItem_p->qosFlowLevelQosParameters->qosCharacteristics.choice.nonDynamic5QI->fiveQI;
+ } else if (qosFlowItem_p->qosFlowLevelQosParameters->qosCharacteristics.present == NGAP_QosCharacteristics_PR_dynamic5QI) {
+ // TODO
+ }
NGAP_PDUSESSION_MODIFY_REQ(message_p).pdusession_modify_params[i].qos[qosIdx].allocation_retention_priority.priority_level =
qosFlowItem_p->qosFlowLevelQosParameters->allocationAndRetentionPriority.priorityLevelARP;
NGAP_PDUSESSION_MODIFY_REQ(message_p).pdusession_modify_params[i].qos[qosIdx].allocation_retention_priority.pre_emp_capability =
@@ -1757,14 +1747,20 @@ int ngap_gNB_handle_pdusession_modify_request(uint32_t assoc_id,
/* optional QosFlowToReleaseList */
case NGAP_ProtocolIE_ID_id_QosFlowToReleaseList:
+ // TODO
+ NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_QosFlowToReleaseList\n");
break;
/* optional AdditionalUL-NGU-UP-TNLInformation */
case NGAP_ProtocolIE_ID_id_AdditionalUL_NGU_UP_TNLInformation:
+ // TODO
+ NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_AdditionalUL_NGU_UP_TNLInformation\n");
break;
/* optional CommonNetworkInstance */
case NGAP_ProtocolIE_ID_id_CommonNetworkInstance:
+ // TODO
+ NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_CommonNetworkInstance\n");
break;
default:
diff --git a/openair3/NGAP/ngap_gNB_nas_procedures.c b/openair3/NGAP/ngap_gNB_nas_procedures.c
index 6686f8c19e0ae5d0584b8dc7698318e3be8015b3..3f4b7d1aa1c4265c30ebd784c56ca02856087f2f 100644
--- a/openair3/NGAP/ngap_gNB_nas_procedures.c
+++ b/openair3/NGAP/ngap_gNB_nas_procedures.c
@@ -48,7 +48,6 @@
#include "ngap_gNB_ue_context.h"
#include "ngap_gNB_nas_procedures.h"
#include "ngap_gNB_management_procedures.h"
-#include "msc.h"
//------------------------------------------------------------------------------
int ngap_gNB_handle_nas_first_req(
@@ -312,14 +311,6 @@ int ngap_gNB_handle_nas_first_req(
}
ue_desc_p->tx_stream = amf_desc_p->nextstream;
- MSC_LOG_TX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- (const char *)NULL,
- 0,
- MSC_AS_TIME_FMT" initialUEMessage initiatingMessage gNB_ue_ngap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_desc_p->gNB_ue_ngap_id);
/* Send encoded message over sctp */
ngap_gNB_itti_send_sctp_data_req(instance_p->instance, amf_desc_p->assoc_id,
buffer, length, ue_desc_p->tx_stream);
@@ -371,14 +362,6 @@ int ngap_gNB_handle_nas_downlink(uint32_t assoc_id,
if ((ue_desc_p = ngap_gNB_get_ue_context(ngap_gNB_instance,
gnb_ue_ngap_id)) == NULL) {
- MSC_LOG_RX_DISCARDED_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- NULL,
- 0,
- MSC_AS_TIME_FMT" downlinkNASTransport gNB_ue_ngap_id %u amf_ue_ngap_id %u",
- gnb_ue_ngap_id,
- amf_ue_ngap_id);
NGAP_ERROR("[SCTP %d] Received NAS downlink message for non existing UE context gNB_UE_NGAP_ID: 0x%lx\n",
assoc_id,
gnb_ue_ngap_id);
@@ -410,15 +393,6 @@ int ngap_gNB_handle_nas_downlink(uint32_t assoc_id,
}
}
- MSC_LOG_RX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- NULL,
- 0,
- MSC_AS_TIME_FMT" downlinkNASTransport gNB_ue_ngap_id %u amf_ue_ngap_id %u",
- assoc_id,
- amf_ue_ngap_id);
-
NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_DownlinkNASTransport_IEs_t, ie, container,
NGAP_ProtocolIE_ID_id_NAS_PDU, true);
/* Forward the NAS PDU to NR-RRC */
@@ -532,15 +506,6 @@ int ngap_gNB_nas_uplink(instance_t instance, ngap_uplink_nas_t *ngap_uplink_nas_
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- (const char *)NULL,
- 0,
- MSC_AS_TIME_FMT" uplinkNASTransport initiatingMessage gNB_ue_ngap_id %u amf_ue_ngap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->gNB_ue_ngap_id,
- ue_context_p->amf_ue_ngap_id);
/* UE associated signalling -> use the allocated stream */
ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
ue_context_p->amf_ref->assoc_id, buffer,
@@ -571,10 +536,6 @@ int ngap_gNB_nas_non_delivery_ind(instance_t instance,
/* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: %08x\n",
ngap_nas_non_delivery_ind->gNB_ue_ngap_id);
- MSC_LOG_EVENT(
- MSC_NGAP_GNB,
- MSC_AS_TIME_FMT" Sent of NAS_NON_DELIVERY_IND to AMF failed, no context for gNB_ue_ngap_id %08x",
- ngap_nas_non_delivery_ind->gNB_ue_ngap_id);
return -1;
}
@@ -621,21 +582,9 @@ int ngap_gNB_nas_non_delivery_ind(instance_t instance,
if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {
NGAP_ERROR("Failed to encode NAS NON delivery indication\n");
/* Encode procedure has failed... */
- MSC_LOG_EVENT(
- MSC_NGAP_GNB,
- MSC_AS_TIME_FMT" Sent of NAS_NON_DELIVERY_IND to AMF failed (encoding)");
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" NASNonDeliveryIndication initiatingMessage gNB_ue_ngap_id %u amf_ue_ngap_id %lu",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->gNB_ue_ngap_id,
- ue_context_p->amf_ue_ngap_id);
/* UE associated signalling -> use the allocated stream */
ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
ue_context_p->amf_ref->assoc_id, buffer,
@@ -868,15 +817,6 @@ int ngap_gNB_initial_ctxt_resp(
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" InitialContextSetup successfulOutcome gNB_ue_ngap_id %u amf_ue_ngap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- initial_ctxt_resp_p->gNB_ue_ngap_id,
- ue_context_p->amf_ue_ngap_id);
/* UE associated signalling -> use the allocated stream */
LOG_I(NR_RRC,"Send message to sctp: NGAP_InitialContextSetupResponse\n");
ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
@@ -961,15 +901,6 @@ int ngap_gNB_ue_capabilities(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" UECapabilityInfoIndication initiatingMessage gNB_ue_ngap_id %u amf_ue_ngap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_cap_info_ind_p->gNB_ue_ngap_id,
- ue_context_p->amf_ue_ngap_id);
/* UE associated signalling -> use the allocated stream */
ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
ue_context_p->amf_ref->assoc_id, buffer,
@@ -1179,15 +1110,6 @@ int ngap_gNB_pdusession_setup_resp(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" PduSession Setup successfulOutcome gNB_ue_ngap_id %u amf_ue_ngap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- pdusession_setup_resp_p->gNB_ue_ngap_id,
- ue_context_p->amf_ue_ngap_id);
/* UE associated signalling -> use the allocated stream */
ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
ue_context_p->amf_ref->assoc_id, buffer,
@@ -1257,7 +1179,7 @@ int ngap_gNB_pdusession_modify_resp(instance_t instance,
ie->value.choice.RAN_UE_NGAP_ID = pdusession_modify_resp_p->gNB_ue_ngap_id;
ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
- /* optional */
+ /* PDUSessionResourceModifyListModRes optional */
if (pdusession_modify_resp_p->nb_of_pdusessions > 0) {
ie = (NGAP_PDUSessionResourceModifyResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyResponseIEs_t));
ie->id = NGAP_ProtocolIE_ID_id_PDUSessionResourceModifyListModRes;
@@ -1265,13 +1187,32 @@ int ngap_gNB_pdusession_modify_resp(instance_t instance,
ie->value.present = NGAP_PDUSessionResourceModifyResponseIEs__value_PR_PDUSessionResourceModifyListModRes;
for (i = 0; i < pdusession_modify_resp_p->nb_of_pdusessions; i++) {
- NGAP_PDUSessionResourceModifyItemModRes_t *item;
-
- item = (NGAP_PDUSessionResourceModifyItemModRes_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyItemModRes_t));
- item->pDUSessionID = pdusession_modify_resp_p->pdusessions[i].pdusession_id;
-
- NGAP_DEBUG("pdusession_modify_resp: modified pdusession ID %ld\n", item->pDUSessionID);
- ASN_SEQUENCE_ADD(&ie->value.choice.PDUSessionResourceModifyListModRes.list, item);
+ NGAP_PDUSessionResourceModifyItemModRes_t *item;
+ NGAP_PDUSessionResourceModifyResponseTransfer_t *transfer_p = NULL;
+
+ item = (NGAP_PDUSessionResourceModifyItemModRes_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyItemModRes_t));
+ item->pDUSessionID = pdusession_modify_resp_p->pdusessions[i].pdusession_id;
+
+ transfer_p = (NGAP_PDUSessionResourceModifyResponseTransfer_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyResponseTransfer_t));
+ transfer_p->qosFlowAddOrModifyResponseList = (NGAP_QosFlowAddOrModifyResponseList_t *)calloc(1, sizeof(NGAP_QosFlowAddOrModifyResponseList_t));
+
+ uint8_t qos_flow_index;
+ for (qos_flow_index = 0; qos_flow_index < pdusession_modify_resp_p->pdusessions[i].nb_of_qos_flow; qos_flow_index++) {
+ NGAP_QosFlowAddOrModifyResponseItem_t *qosFlowAddOrModifyResponseItem_p = calloc(1, sizeof(NGAP_QosFlowAddOrModifyResponseItem_t));
+ qosFlowAddOrModifyResponseItem_p->qosFlowIdentifier =
+ pdusession_modify_resp_p->pdusessions[i].qos[qos_flow_index].qfi;
+ ASN_SEQUENCE_ADD(&transfer_p->qosFlowAddOrModifyResponseList->list, qosFlowAddOrModifyResponseItem_p);
+ }
+
+ memset(&res, 0, sizeof(res));
+ res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_PDUSessionResourceModifyResponseTransfer, transfer_p);
+ item->pDUSessionResourceModifyResponseTransfer.buf = res.buffer;
+ item->pDUSessionResourceModifyResponseTransfer.size = res.result.encoded;
+
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceModifyResponseTransfer, transfer_p);
+
+ NGAP_DEBUG("pdusession_modify_resp: modified pdusession ID %ld\n", item->pDUSessionID);
+ ASN_SEQUENCE_ADD(&ie->value.choice.PDUSessionResourceModifyListModRes.list, item);
}
ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
@@ -1353,15 +1294,6 @@ int ngap_gNB_pdusession_modify_resp(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" E_RAN Modify successful Outcome gNB_ue_ngap_id %u amf_ue_ngap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- pdusession_modify_resp_p->gNB_ue_ngap_id,
- ue_context_p->amf_ue_ngap_id);
/* UE associated signalling -> use the allocated stream */
ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
ue_context_p->amf_ref->assoc_id, buffer,
@@ -1464,15 +1396,6 @@ int ngap_gNB_pdusession_release_resp(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_NGAP_GNB,
- MSC_NGAP_AMF,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" E_RAN Release successfulOutcome gNB_ue_ngap_id %u amf_ue_ngap_id %lu",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- pdusession_release_resp_p->gNB_ue_ngap_id,
- (uint64_t)ue_context_p->amf_ue_ngap_id);
/* UE associated signalling -> use the allocated stream */
ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
ue_context_p->amf_ref->assoc_id, buffer,
diff --git a/openair3/S1AP/s1ap_eNB.c b/openair3/S1AP/s1ap_eNB.c
index e528c9e53eb4e87ca439deb2217a87d2a51710b4..5f30386bb335253532d2a143f982cd6f59c645d4 100644
--- a/openair3/S1AP/s1ap_eNB.c
+++ b/openair3/S1AP/s1ap_eNB.c
@@ -56,7 +56,6 @@
#include "s1ap_eNB_itti_messaging.h"
#include "s1ap_eNB_ue_context.h" // test, to be removed
-#include "msc.h"
#include "assertions.h"
#include "conversions.h"
@@ -507,7 +506,6 @@ void s1ap_eNB_init(void) {
S1AP_DEBUG("Starting S1AP layer\n");
s1ap_eNB_prepare_internal_data();
itti_mark_task_ready(TASK_S1AP);
- MSC_START_USE();
}
void *s1ap_eNB_process_itti_msg(void *notUsed) {
diff --git a/openair3/S1AP/s1ap_eNB_context_management_procedures.c b/openair3/S1AP/s1ap_eNB_context_management_procedures.c
index 374da7272fda4a43a770eb43b8587de6f01ef584..6255abb14d6d3b0525ae9a13c07a7197d36f9071 100644
--- a/openair3/S1AP/s1ap_eNB_context_management_procedures.c
+++ b/openair3/S1AP/s1ap_eNB_context_management_procedures.c
@@ -47,7 +47,6 @@
#include "s1ap_eNB_nas_procedures.h"
#include "s1ap_eNB_management_procedures.h"
#include "s1ap_eNB_context_management_procedures.h"
-#include "msc.h"
int s1ap_ue_context_release_complete(instance_t instance,
@@ -111,16 +110,6 @@ int s1ap_ue_context_release_complete(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- buffer,
- length,
- MSC_AS_TIME_FMT" UEContextRelease successfulOutcome eNB_ue_s1ap_id %u mme_ue_s1ap_id %u",
- 0,0, //MSC_AS_TIME_ARGS(ctxt_pP),
- ue_release_complete_p->eNB_ue_s1ap_id,
- ue_context_p->mme_ue_s1ap_id);
-
/* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer,
@@ -246,16 +235,6 @@ int s1ap_ue_context_release_req(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- buffer,
- length,
- MSC_AS_TIME_FMT" UEContextReleaseRequest initiatingMessage eNB_ue_s1ap_id %u mme_ue_s1ap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_release_req_p->eNB_ue_s1ap_id,
- ue_context_p->mme_ue_s1ap_id);
-
/* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer,
diff --git a/openair3/S1AP/s1ap_eNB_handlers.c b/openair3/S1AP/s1ap_eNB_handlers.c
index 9ee3287b94f3b43a236b0d41ae85a79270682c00..b3b38e7017a55c99d7af8a66e5bec8d51dfdac08 100644
--- a/openair3/S1AP/s1ap_eNB_handlers.c
+++ b/openair3/S1AP/s1ap_eNB_handlers.c
@@ -51,7 +51,6 @@
#include "assertions.h"
#include "conversions.h"
-#include "msc.h"
static
int s1ap_eNB_handle_s1_setup_response(uint32_t assoc_id,
@@ -1025,14 +1024,6 @@ int s1ap_eNB_handle_ue_context_release_command(uint32_t assoc_id,
case S1AP_UE_S1AP_IDs_PR_uE_S1AP_ID_pair:
enb_ue_s1ap_id = ie->value.choice.UE_S1AP_IDs.choice.uE_S1AP_ID_pair.eNB_UE_S1AP_ID;
mme_ue_s1ap_id = ie->value.choice.UE_S1AP_IDs.choice.uE_S1AP_ID_pair.mME_UE_S1AP_ID;
- MSC_LOG_RX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- NULL,0,
- "0 UEContextRelease/%s eNB_ue_s1ap_id "S1AP_UE_ID_FMT" mme_ue_s1ap_id "S1AP_UE_ID_FMT" len %u",
- s1ap_direction2String(pdu->present - 1),
- enb_ue_s1ap_id,
- mme_ue_s1ap_id);
if ((ue_desc_p = s1ap_eNB_get_ue_context(mme_desc_p->s1ap_eNB_instance,
enb_ue_s1ap_id)) == NULL) {
@@ -1042,12 +1033,6 @@ int s1ap_eNB_handle_ue_context_release_command(uint32_t assoc_id,
enb_ue_s1ap_id);
return -1;
} else {
- MSC_LOG_TX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_RRC_ENB,
- NULL,0,
- "0 S1AP_UE_CONTEXT_RELEASE_COMMAND/%d eNB_ue_s1ap_id "S1AP_UE_ID_FMT" ",
- enb_ue_s1ap_id);
message_p = itti_alloc_new_message(TASK_S1AP, 0, S1AP_UE_CONTEXT_RELEASE_COMMAND);
if (ue_desc_p->mme_ue_s1ap_id == 0) { // case of Detach Request and switch off from RRC_IDLE mode
diff --git a/openair3/S1AP/s1ap_eNB_nas_procedures.c b/openair3/S1AP/s1ap_eNB_nas_procedures.c
index b55bc06e11a4842a4d607023cb85f05f75ac8e95..0b56d312114a4ab8ea7d42ae43d2f1cbb8e4dbdb 100644
--- a/openair3/S1AP/s1ap_eNB_nas_procedures.c
+++ b/openair3/S1AP/s1ap_eNB_nas_procedures.c
@@ -46,7 +46,6 @@
#include "s1ap_eNB_ue_context.h"
#include "s1ap_eNB_nas_procedures.h"
#include "s1ap_eNB_management_procedures.h"
-#include "msc.h"
//------------------------------------------------------------------------------
int s1ap_eNB_handle_nas_first_req(
@@ -310,14 +309,6 @@ int s1ap_eNB_handle_nas_first_req(
}
ue_desc_p->tx_stream = mme_desc_p->nextstream;
- MSC_LOG_TX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- (const char *)NULL,
- 0,
- MSC_AS_TIME_FMT" initialUEMessage initiatingMessage eNB_ue_s1ap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_desc_p->eNB_ue_s1ap_id);
/* Send encoded message over sctp */
s1ap_eNB_itti_send_sctp_data_req(instance_p->instance, mme_desc_p->assoc_id,
buffer, length, ue_desc_p->tx_stream);
@@ -374,14 +365,6 @@ int s1ap_eNB_handle_nas_downlink(uint32_t assoc_id,
if ((ue_desc_p = s1ap_eNB_get_ue_context(s1ap_eNB_instance,
enb_ue_s1ap_id)) == NULL) {
- MSC_LOG_RX_DISCARDED_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- NULL,
- 0,
- MSC_AS_TIME_FMT" downlinkNASTransport eNB_ue_s1ap_id %u mme_ue_s1ap_id %u",
- enb_ue_s1ap_id,
- mme_ue_s1ap_id);
S1AP_ERROR("[SCTP %d] Received NAS downlink message for non existing UE context eNB_UE_S1AP_ID: 0x%lx\n",
assoc_id,
enb_ue_s1ap_id);
@@ -413,15 +396,6 @@ int s1ap_eNB_handle_nas_downlink(uint32_t assoc_id,
}
}
- MSC_LOG_RX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- NULL,
- 0,
- MSC_AS_TIME_FMT" downlinkNASTransport eNB_ue_s1ap_id %u mme_ue_s1ap_id %u",
- assoc_id,
- mme_ue_s1ap_id);
-
S1AP_FIND_PROTOCOLIE_BY_ID(S1AP_DownlinkNASTransport_IEs_t, ie, container,
S1AP_ProtocolIE_ID_id_NAS_PDU, true);
if(ie == NULL)
@@ -536,15 +510,6 @@ int s1ap_eNB_nas_uplink(instance_t instance, s1ap_uplink_nas_t *s1ap_uplink_nas_
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- (const char *)NULL,
- 0,
- MSC_AS_TIME_FMT" uplinkNASTransport initiatingMessage eNB_ue_s1ap_id %u mme_ue_s1ap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->eNB_ue_s1ap_id,
- ue_context_p->mme_ue_s1ap_id);
/* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer,
@@ -574,10 +539,6 @@ int s1ap_eNB_nas_non_delivery_ind(instance_t instance,
/* The context for this eNB ue s1ap id doesn't exist in the map of eNB UEs */
S1AP_WARN("Failed to find ue context associated with eNB ue s1ap id: %06x\n",
s1ap_nas_non_delivery_ind->eNB_ue_s1ap_id);
- MSC_LOG_EVENT(
- MSC_S1AP_ENB,
- MSC_AS_TIME_FMT" Sent of NAS_NON_DELIVERY_IND to MME failed, no context for eNB_ue_s1ap_id %06x",
- s1ap_nas_non_delivery_ind->eNB_ue_s1ap_id);
return -1;
}
@@ -623,21 +584,9 @@ int s1ap_eNB_nas_non_delivery_ind(instance_t instance,
if (s1ap_eNB_encode_pdu(&pdu, &buffer, &length) < 0) {
S1AP_ERROR("Failed to encode NAS NON delivery indication\n");
/* Encode procedure has failed... */
- MSC_LOG_EVENT(
- MSC_S1AP_ENB,
- MSC_AS_TIME_FMT" Sent of NAS_NON_DELIVERY_IND to MME failed (encoding)");
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" NASNonDeliveryIndication initiatingMessage eNB_ue_s1ap_id %u mme_ue_s1ap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->eNB_ue_s1ap_id,
- ue_context_p->mme_ue_s1ap_id);
/* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer,
@@ -802,15 +751,6 @@ int s1ap_eNB_initial_ctxt_resp(
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" InitialContextSetup successfulOutcome eNB_ue_s1ap_id %u mme_ue_s1ap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- initial_ctxt_resp_p->eNB_ue_s1ap_id,
- ue_context_p->mme_ue_s1ap_id);
/* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer,
@@ -891,15 +831,6 @@ int s1ap_eNB_ue_capabilities(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" UECapabilityInfoIndication initiatingMessage eNB_ue_s1ap_id %u mme_ue_s1ap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_cap_info_ind_p->eNB_ue_s1ap_id,
- ue_context_p->mme_ue_s1ap_id);
/* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer,
@@ -1075,15 +1006,6 @@ int s1ap_eNB_e_rab_setup_resp(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" E_RAN Setup successfulOutcome eNB_ue_s1ap_id %u mme_ue_s1ap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- e_rab_setup_resp_p->eNB_ue_s1ap_id,
- ue_context_p->mme_ue_s1ap_id);
/* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer,
@@ -1238,15 +1160,6 @@ int s1ap_eNB_e_rab_modify_resp(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" E_RAN Modify successful Outcome eNB_ue_s1ap_id %u mme_ue_s1ap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- e_rab_modify_resp_p->eNB_ue_s1ap_id,
- ue_context_p->mme_ue_s1ap_id);
/* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer,
@@ -1378,15 +1291,6 @@ int s1ap_eNB_e_rab_release_resp(instance_t instance,
return -1;
}
- MSC_LOG_TX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" E_RAN Release successfulOutcome eNB_ue_s1ap_id %u mme_ue_s1ap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- e_rab_release_resp_p->eNB_ue_s1ap_id,
- ue_context_p->mme_ue_s1ap_id);
/* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer,
@@ -1615,16 +1519,6 @@ int s1ap_eNB_path_switch_req(instance_t instance,
ue_context_p->tx_stream = mme_desc_p->nextstream;
- MSC_LOG_TX_MESSAGE(
- MSC_S1AP_ENB,
- MSC_S1AP_MME,
- (const char *)buffer,
- length,
- MSC_AS_TIME_FMT" E_RAN Setup successfulOutcome eNB_ue_s1ap_id %u mme_ue_s1ap_id %u",
- 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
- ue_context_p->eNB_ue_s1ap_id,
- path_switch_req_p->mme_ue_s1ap_id);
-
/* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
mme_desc_p->assoc_id, buffer,
diff --git a/openair3/SCTP/sctp_eNB_task.c b/openair3/SCTP/sctp_eNB_task.c
index 8d0166f80534436b6017cb415a284d7fd7b86848..ab49125856c5abe1a3967242badf1015e74eeaa1 100644
--- a/openair3/SCTP/sctp_eNB_task.c
+++ b/openair3/SCTP/sctp_eNB_task.c
@@ -48,7 +48,6 @@
#include "sctp_default_values.h"
#include "sctp_common.h"
#include "sctp_eNB_itti_messaging.h"
-#include "msc.h"
/* Used to format an uint32_t containing an ipv4 address */
#define IPV4_ADDR "%u.%u.%u.%u"
@@ -1097,8 +1096,6 @@ void sctp_eNB_init(void)
STAILQ_INIT(&sctp_cnx_list);
itti_mark_task_ready(TASK_SCTP);
- MSC_START_USE();
-
}
//------------------------------------------------------------------------------
diff --git a/openair3/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb.band7.tm1.usrpb210.epc.local.conf b/openair3/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb.band7.tm1.usrpb210.epc.local.conf
index 85cee4dda0685d20afa6b3e6604a45881974d7f1..ad6c81f56b4ce972f78f31b0bd0f7e8a52701f6e 100644
--- a/openair3/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb.band7.tm1.usrpb210.epc.local.conf
+++ b/openair3/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb.band7.tm1.usrpb210.epc.local.conf
@@ -148,23 +148,14 @@ eNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
gtpu_log_level ="info";
- gtpu_log_verbosity ="medium";
udp_log_level ="info";
- udp_log_verbosity ="medium";
};
}
diff --git a/openair3/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb1.conf b/openair3/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb1.conf
index df06231e4a54706a8725faf4fc760cb1bc04753d..9ffed9c5fec0acf3224dbe38b7616bc0abfda54a 100644
--- a/openair3/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb1.conf
+++ b/openair3/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb1.conf
@@ -148,19 +148,11 @@ eNBs =
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
- mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/openair3/TEST/EPC_TEST/play_scenario_s1ap.c b/openair3/TEST/EPC_TEST/play_scenario_s1ap.c
index c4674e89011b2da8c6cf0c186aedc640fe85509f..fe132fd2f5d270adf407956cc2836d0a8e398e1f 100644
--- a/openair3/TEST/EPC_TEST/play_scenario_s1ap.c
+++ b/openair3/TEST/EPC_TEST/play_scenario_s1ap.c
@@ -44,7 +44,6 @@
#include "s1ap_common.h"
#include "play_scenario_s1ap_eNB_defs.h"
#include "play_scenario.h"
-#include "msc.h"
//------------------------------------------------------------------------------
s1ap_eNB_internal_data_t s1ap_eNB_internal_data;
RB_GENERATE(s1ap_mme_map, s1ap_eNB_mme_data_s, entry, et_s1ap_eNB_compare_assoc_id);
@@ -1084,7 +1083,6 @@ void *et_s1ap_eNB_task(void *arg)
et_s1ap_eNB_prepare_internal_data();
itti_mark_task_ready(TASK_S1AP);
- MSC_START_USE();
while (1) {
itti_receive_msg(TASK_S1AP, &received_msg);
diff --git a/openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c b/openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c
index bc7ca6afbd0d1e3cd4a95b28ad8b58c221a4d651..40654fc77159b32e5773d52112057da45217b2a9 100644
--- a/openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c
+++ b/openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c
@@ -49,7 +49,6 @@
#include "s1ap_common.h"
#include "play_scenario_s1ap_eNB_defs.h"
#include "play_scenario.h"
-#include "msc.h"
//------------------------------------------------------------------------------
extern et_scenario_t *g_scenario;
extern uint32_t g_constraints;
diff --git a/openair3/UDP/udp_eNB_task.c b/openair3/UDP/udp_eNB_task.c
deleted file mode 100644
index 8b9fc77bb14ebcff3ce765504113a385a2d408bf..0000000000000000000000000000000000000000
--- a/openair3/UDP/udp_eNB_task.c
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file udp_eNB_task.c
-* \brief
-* \author Sebastien ROUX, Lionel Gauthier
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <pthread.h>
-
-#include "queue.h"
-#include "intertask_interface.h"
-#include "assertions.h"
-#include "udp_eNB_task.h"
-
-#include "common/utils/LOG/log.h"
-#include "common/utils/LOG/vcd_signal_dumper.h"
-#include "msc.h"
-
-
-#define IPV4_ADDR "%u.%u.%u.%u"
-#define IPV4_ADDR_FORMAT(aDDRESS) \
- (uint8_t)((aDDRESS) & 0x000000ff), \
- (uint8_t)(((aDDRESS) & 0x0000ff00) >> 8 ), \
- (uint8_t)(((aDDRESS) & 0x00ff0000) >> 16), \
- (uint8_t)(((aDDRESS) & 0xff000000) >> 24)
-
-
-struct udp_socket_desc_s {
- int sd; /* Socket descriptor to use */
-
- pthread_t listener_thread; /* Thread affected to recv */
-
- char *local_address; /* Local ipv4 address to use */
- uint16_t local_port; /* Local port to use */
-
- task_id_t task_id; /* Task who has requested the new endpoint */
-
- STAILQ_ENTRY(udp_socket_desc_s) entries;
-};
-
-static STAILQ_HEAD(udp_socket_list_s, udp_socket_desc_s) udp_socket_list;
-static pthread_mutex_t udp_socket_list_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-
-static
-struct udp_socket_desc_s *
-udp_eNB_get_socket_desc(task_id_t task_id);
-
-void udp_eNB_process_file_descriptors(
- struct epoll_event *events,
- int nb_events);
-
-static
-int
-udp_eNB_create_socket(
- int port,
- char *ip_addr,
- task_id_t task_id);
-
-int
-udp_eNB_send_to(
- int sd,
- uint16_t port,
- uint32_t address,
- const uint8_t *buffer,
- uint32_t length);
-
-void udp_eNB_receiver(struct udp_socket_desc_s *udp_sock_pP);
-
-void *udp_eNB_task(void *args_p);
-
-int udp_enb_init(void);
-/* @brief Retrieve the descriptor associated with the task_id
- */
-static
-struct udp_socket_desc_s *udp_eNB_get_socket_desc(task_id_t task_id)
-{
- struct udp_socket_desc_s *udp_sock_p = NULL;
-
-#if defined(LOG_UDP) && LOG_UDP > 0
- LOG_T(UDP_, "Looking for task %d\n", task_id);
-#endif
-
- STAILQ_FOREACH(udp_sock_p, &udp_socket_list, entries) {
- if (udp_sock_p->task_id == task_id) {
-#if defined(LOG_UDP) && LOG_UDP > 0
- LOG_T(UDP_, "Found matching task desc\n");
-#endif
- break;
- }
- }
- return udp_sock_p;
-}
-
-void udp_eNB_process_file_descriptors(struct epoll_event *events, int nb_events)
-{
- int i;
- struct udp_socket_desc_s *udp_sock_p = NULL;
-
- if (events == NULL) {
- return;
- }
-
- for (i = 0; i < nb_events; i++) {
- STAILQ_FOREACH(udp_sock_p, &udp_socket_list, entries) {
- if (udp_sock_p->sd == events[i].data.fd) {
-#if defined(LOG_UDP) && LOG_UDP > 0
- LOG_D(UDP_, "Found matching task desc\n");
-#endif
- udp_eNB_receiver(udp_sock_p);
- break;
- }
- }
- }
-}
-
-static
-int udp_eNB_create_socket(int port, char *ip_addr, task_id_t task_id)
-{
-
- struct udp_socket_desc_s *udp_socket_desc_p = NULL;
- int sd, rc;
- struct sockaddr_in sin;
-
- LOG_I(UDP_, "Initializing UDP for local address %s with port %d\n", ip_addr, port);
-
- sd = socket(AF_INET, SOCK_DGRAM, 0);
- AssertFatal(sd > 0, "UDP: Failed to create new socket: (%s:%d)\n", strerror(errno), errno);
-
- memset(&sin, 0, sizeof(struct sockaddr_in));
- sin.sin_family = AF_INET;
- sin.sin_port = htons(port);
-
- if (ip_addr == NULL) {
- sin.sin_addr.s_addr = inet_addr(INADDR_ANY);
- } else {
- sin.sin_addr.s_addr = inet_addr(ip_addr);
- }
-
- if ((rc = bind(sd, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) < 0) {
- close(sd);
- LOG_E(UDP_, "Failed to bind socket: (%s:%d) address %s port %d\n", strerror(errno), errno, ip_addr, port);
- return -1;
- }
-
- /* Create a new descriptor for this connection */
- udp_socket_desc_p = calloc(1, sizeof(struct udp_socket_desc_s));
-
- DevAssert(udp_socket_desc_p != NULL);
-
- udp_socket_desc_p->sd = sd;
- udp_socket_desc_p->local_address = ip_addr;
- udp_socket_desc_p->local_port = port;
- udp_socket_desc_p->task_id = task_id;
-
- LOG_I(UDP_, "Inserting new descriptor for task %d, sd %d\n", udp_socket_desc_p->task_id, udp_socket_desc_p->sd);
- pthread_mutex_lock(&udp_socket_list_mutex);
- STAILQ_INSERT_TAIL(&udp_socket_list, udp_socket_desc_p, entries);
- pthread_mutex_unlock(&udp_socket_list_mutex);
-
- itti_subscribe_event_fd(TASK_UDP, sd);
- LOG_I(UDP_, "Initializing UDP for local address %s with port %d: DONE\n", ip_addr, port);
- return sd;
-}
-
-int
-udp_eNB_send_to(
- int sd,
- uint16_t port,
- uint32_t address,
- const uint8_t *buffer,
- uint32_t length)
-{
- struct sockaddr_in to;
- socklen_t to_length;
-
- if (sd <= 0 || ((buffer == NULL) && (length > 0))) {
- LOG_E(UDP_, "udp_send_to: bad param\n");
- return -1;
- }
-
- memset(&to, 0, sizeof(struct sockaddr_in));
- to_length = sizeof(to);
-
- to.sin_family = AF_INET;
- to.sin_port = htons(port);
- to.sin_addr.s_addr = address;
-
- if (sendto(sd, (void *)buffer, (size_t)length, 0, (struct sockaddr *)&to,
- to_length) < 0) {
- LOG_E(UDP_,
- "[SD %d] Failed to send data to "IPV4_ADDR" on port %d, buffer size %u\n",
- sd, IPV4_ADDR_FORMAT(address), port, length);
- return -1;
- }
-
-#if defined(LOG_UDP) && LOG_UDP > 0
- LOG_I(UDP_, "[SD %d] Successfully sent to "IPV4_ADDR
- " on port %d, buffer size %u, buffer address %x\n",
- sd, IPV4_ADDR_FORMAT(address), port, length, buffer);
-#endif
- return 0;
-}
-
-
-void udp_eNB_receiver(struct udp_socket_desc_s *udp_sock_pP)
-{
- uint8_t l_buffer[NFAPI_MAX_PACKED_MESSAGE_SIZE];
- int n;
- socklen_t from_len;
- struct sockaddr_in addr;
- MessageDef *message_p = NULL;
- udp_data_ind_t *udp_data_ind_p = NULL;
- uint8_t *forwarded_buffer = NULL;
-
- if (1) {
- from_len = (socklen_t)sizeof(struct sockaddr_in);
-
- if ((n = recvfrom(udp_sock_pP->sd, l_buffer, sizeof(l_buffer), MSG_TRUNC,
- (struct sockaddr *)&addr, &from_len)) < 0) {
- LOG_E(UDP_, "Recvfrom failed %s\n", strerror(errno));
- return;
- } else if (n > sizeof(l_buffer)) {
- LOG_E(UDP_, "%s(%d). Message truncated. %d\n", __FUNCTION__, __LINE__, n);
- return;
- } else if (n == 0) {
- LOG_W(UDP_, "Recvfrom returned 0\n");
- return;
- } else {
- forwarded_buffer = itti_malloc(TASK_UDP, udp_sock_pP->task_id, n*sizeof(uint8_t));
- DevAssert(forwarded_buffer != NULL);
- memcpy(forwarded_buffer, l_buffer, n);
- message_p = itti_alloc_new_message(TASK_UDP, 0, UDP_DATA_IND);
- DevAssert(message_p != NULL);
- udp_data_ind_p = &message_p->ittiMsg.udp_data_ind;
- udp_data_ind_p->buffer = forwarded_buffer;
- udp_data_ind_p->buffer_length = n;
- udp_data_ind_p->peer_port = htons(addr.sin_port);
- udp_data_ind_p->peer_address = addr.sin_addr.s_addr;
-
-#if defined(LOG_UDP) && LOG_UDP > 0
- LOG_I(UDP_, "Msg of length %d received from %s:%u\n",
- n, inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));
-#endif
-
- /* TODO: this is a hack. Let's accept failures and do nothing when
- * it happens. Since itti_send_msg_to_task crashes when the message
- * queue is full we wrote itti_try_send_msg_to_task that returns -1
- * if the queue is full.
- */
- /* look for HACK_RLC_UM_LIMIT for others places related to the hack. Please do not remove this comment. */
- if (itti_send_msg_to_task(udp_sock_pP->task_id, INSTANCE_DEFAULT, message_p) < 0) {
- LOG_E(UDP_, "Failed to send message %d to task %d\n",
- UDP_DATA_IND,
- udp_sock_pP->task_id);
- itti_free(TASK_UDP, message_p);
- itti_free(TASK_UDP, forwarded_buffer);
- return;
- }
- }
- }
-
- //close(udp_sock_p->sd);
- //udp_sock_p->sd = -1;
-
- //pthread_mutex_lock(&udp_socket_list_mutex);
- //STAILQ_REMOVE(&udp_socket_list, udp_sock_p, udp_socket_desc_s, entries);
- //pthread_mutex_unlock(&udp_socket_list_mutex);
-}
-
-
-void *udp_eNB_task(void *args_p)
-{
- int nb_events;
- struct epoll_event *events;
- MessageDef *received_message_p = NULL;
- //const char *msg_name = NULL;
- //instance_t instance = 0;
- udp_enb_init();
-
- itti_mark_task_ready(TASK_UDP);
- MSC_START_USE();
-
- while(1) {
- itti_receive_msg(TASK_UDP, &received_message_p);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UDP_ENB_TASK, VCD_FUNCTION_IN);
-#if defined(LOG_UDP) && LOG_UDP > 0
- LOG_D(UDP_, "Got message %p\n", &received_message_p);
-#endif
-
- if (received_message_p != NULL) {
-
- //msg_name = ITTI_MSG_NAME (received_message_p);
- //instance = ITTI_MSG_DESTINATION_INSTANCE (received_message_p);
-
- switch (ITTI_MSG_ID(received_message_p)) {
- case UDP_INIT: {
- LOG_D(UDP_, "Received UDP_INIT\n");
- udp_init_t *udp_init_p;
- udp_init_p = &received_message_p->ittiMsg.udp_init;
- udp_eNB_create_socket(
- udp_init_p->port,
- udp_init_p->address,
- ITTI_MSG_ORIGIN_ID(received_message_p));
- }
- break;
-
- case UDP_DATA_REQ: {
-#if defined(LOG_UDP) && LOG_UDP > 0
- LOG_D(UDP_, "Received UDP_DATA_REQ\n");
-#endif
- int udp_sd = -1;
- ssize_t bytes_written;
-
- struct udp_socket_desc_s *udp_sock_p = NULL;
- udp_data_req_t *udp_data_req_p;
- struct sockaddr_in peer_addr;
-
- udp_data_req_p = &received_message_p->ittiMsg.udp_data_req;
-
- memset(&peer_addr, 0, sizeof(struct sockaddr_in));
-
- peer_addr.sin_family = AF_INET;
- peer_addr.sin_port = htons(udp_data_req_p->peer_port);
- peer_addr.sin_addr.s_addr = udp_data_req_p->peer_address;
-
- pthread_mutex_lock(&udp_socket_list_mutex);
- udp_sock_p = udp_eNB_get_socket_desc(ITTI_MSG_ORIGIN_ID(received_message_p));
-
- if (udp_sock_p == NULL) {
- LOG_E(UDP_,
- "Failed to retrieve the udp socket descriptor "
- "associated with task %d\n",
- ITTI_MSG_ORIGIN_ID(received_message_p));
- pthread_mutex_unlock(&udp_socket_list_mutex);
-
- if (udp_data_req_p->buffer) {
- itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), udp_data_req_p->buffer);
- }
-
- goto on_error;
- }
-
- udp_sd = udp_sock_p->sd;
- pthread_mutex_unlock(&udp_socket_list_mutex);
-
-//#if defined(LOG_UDP) && LOG_UDP > 0
- LOG_D(UDP_, "[%d] Sending message of size %u to "IPV4_ADDR" and port %u\n",
- udp_sd,
- udp_data_req_p->buffer_length,
- IPV4_ADDR_FORMAT(udp_data_req_p->peer_address),
- udp_data_req_p->peer_port);
-//#endif
- bytes_written = sendto(
- udp_sd,
- &udp_data_req_p->buffer[udp_data_req_p->buffer_offset],
- udp_data_req_p->buffer_length,
- 0,
- (struct sockaddr *)&peer_addr,
- sizeof(struct sockaddr_in));
-
- if (bytes_written != udp_data_req_p->buffer_length) {
- LOG_E(UDP_, "There was an error while writing to socket %d rc %zd"
- "(%d:%s) May be normal if GTPU kernel module loaded on same host (may NF_DROP IP packet)\n",
- udp_sd, bytes_written, errno, strerror(errno));
- }
-
- itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), udp_data_req_p->buffer);
- }
- break;
-
- case TERMINATE_MESSAGE: {
- LOG_W(UDP_, " *** Exiting UDP thread\n");
- itti_exit_task();
- }
- break;
-
- case MESSAGE_TEST: {
- } break;
-
- default: {
- LOG_W(UDP_, "Unkwnon message ID %d:%s\n",
- ITTI_MSG_ID(received_message_p),
- ITTI_MSG_NAME(received_message_p));
- }
- break;
- }
-
-on_error:
- itti_free (ITTI_MSG_ORIGIN_ID(received_message_p), received_message_p);
- received_message_p = NULL;
- }
-
- nb_events = itti_get_events(TASK_UDP, &events);
-
- /* Now handle notifications for other sockets */
- if (nb_events > 0) {
-#if defined(LOG_UDP) && LOG_UDP > 0
- LOG_D(UDP_, "UDP task Process %d events\n",nb_events);
-#endif
- udp_eNB_process_file_descriptors(events, nb_events);
- }
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UDP_ENB_TASK, VCD_FUNCTION_OUT);
- }
-
- LOG_I(UDP_, "Task UDP eNB exiting\n");
- return NULL;
-}
-
-int udp_enb_init(void)
-{
- LOG_I(UDP_, "Initializing UDP task interface\n");
- STAILQ_INIT(&udp_socket_list);
- LOG_I(UDP_, "Initializing UDP task interface: DONE\n");
- return 0;
-}
diff --git a/openair3/UDP/udp_eNB_task.h b/openair3/UDP/udp_eNB_task.h
deleted file mode 100644
index 8b783f7455c08f6aec5a0d80788b51746a9feb51..0000000000000000000000000000000000000000
--- a/openair3/UDP/udp_eNB_task.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/*! \file udp_eNB_task.h
-* \brief
-* \author Sebastien ROUX, Lionel Gauthier
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-*/
-#include <pthread.h>
-#include <stdint.h>
-
-#ifndef UDP_ENB_TASK_H_
-#define UDP_ENB_TASK_H_
-#include "enb_config.h"
-
-
-/** \brief UDP recv callback prototype. Will be called every time a payload is
- * received on socket.
- * \param port Port on which data had been received
- * \param address Sender Ipv4 address
- * \param buffer Pointer to data (should be freed by user)
- * \param length Length of message received
- * \param arg_p User provided argument (transparent for wrappers)
- * @returns Execution result
- */
-typedef int (*udp_recv_callback)(uint16_t port,
- uint32_t address,
- uint8_t *buffer,
- uint32_t length,
- void *arg_p);
-
-typedef struct {
- int sd; /* Socket descriptor to use */
- pthread_t listener_thread; /* Thread affected to recv */
- char *local_address; /* Local ipv4 address to use */
- uint16_t local_port; /* Local port to use */
- task_id_t task_id; /* Task who has requested the new endpoint */
-} udp_data_t;
-
-/** \brief Create new datagram connection-less socket and create new thread
- * for data in downstream.
- * \param ip_addr Local IPv4 address to use
- * \param port Local port to use
- * \param udp_data_p
- * \param recv_callback Pointer to data (should be freed by user)
- * \param arg_p Optionnal argument to pass to recv_callback
- * @returns < 0 on failure or socket descriptor on success
- */
-int udp_create_connection(char *ip_addr, uint16_t port,
- udp_data_t *udp_data_p,
- udp_recv_callback recv_callback,
- void *arg_p);
-
-/** \brief Send buffer to remote peer.
- * \param sd socket descriptor to use
- * \param port remote port
- * \param address remote address
- * \param buffer Data buffer to send
- * \param length Buffer length
- * @returns < 0 on failure or socket descriptor on success
- */
-int udp_send_to(int sd, uint16_t port, uint32_t address,
- const uint8_t *buffer, uint32_t length);
-
-
-/** \brief UDP ITTI task on eNB.
- * \param args_p
- * @returns always NULL
- */
-void *udp_eNB_task(void *args_p);
-
-/** \brief init UDP layer.
- * \param enb_config_p configuration of eNB
- * @returns always 0
- */
-int udp_enb_init(void);
-
-#endif /* UDP_ENB_TASK_H_ */
diff --git a/openair3/ocp-gtpu/gtp_itf.cpp b/openair3/ocp-gtpu/gtp_itf.cpp
index 64146bc7cac61caaf12b19a46629288f12ba16e2..cc41de3550bb701e3b04cf09733aab6fb96dc347 100644
--- a/openair3/ocp-gtpu/gtp_itf.cpp
+++ b/openair3/ocp-gtpu/gtp_itf.cpp
@@ -46,7 +46,7 @@ typedef struct Gtpv1uMsgHeader {
#define GTP_GPDU (255)
-typedef struct ocp_gtpv1u_bearer_s {
+typedef struct gtpv1u_bearer_s {
/* TEID used in dl and ul */
teid_t teid_incoming; ///< eNB TEID
teid_t teid_outgoing; ///< Remote TEID
@@ -55,10 +55,10 @@ typedef struct ocp_gtpv1u_bearer_s {
tcp_udp_port_t outgoing_port;
uint16_t seqNum;
uint8_t npduNum;
-} ocp_gtpv1u_bearer_t;
+} gtpv1u_bearer_t;
typedef struct {
- map<int, ocp_gtpv1u_bearer_t> bearers;
+ map<int, gtpv1u_bearer_t> bearers;
} teidData_t;
typedef struct {
@@ -79,7 +79,7 @@ class gtpEndPoint {
// this allow using non standard gtp port number (different from 2152)
// and so, for example tu run 4G and 5G cores on one system
tcp_udp_port_t get_dstport() {
- return (tcp_udp_port_t)atol(addr.destinationService);
+ return (tcp_udp_port_t)atol(addr.destinationService);
}
};
@@ -106,10 +106,10 @@ instance_t legacyInstanceMapping=0;
#define compatInst(a) ((a)==0 || (a)==INSTANCE_DEFAULT?legacyInstanceMapping:a)
#define GTPV1U_HEADER_SIZE (8)
-
-
- static int gtpv1uCreateAndSendMsg(int h, uint32_t peerIp, uint16_t peerPort, int msgType, teid_t teid, uint8_t *Msg,int msgLen,
- bool seqNumFlag, bool npduNumFlag, bool extHdrFlag, int seqNum, int npduNum, int extHdrType) {
+
+
+static int gtpv1uCreateAndSendMsg(int h, uint32_t peerIp, uint16_t peerPort, int msgType, teid_t teid, uint8_t *Msg,int msgLen,
+ bool seqNumFlag, bool npduNumFlag, bool extHdrFlag, int seqNum, int npduNum, int extHdrType) {
AssertFatal(extHdrFlag==false,"Not developped");
int headerAdditional=0;
@@ -149,6 +149,7 @@ instance_t legacyInstanceMapping=0;
to.sin_addr.s_addr = peerIp ;
LOG_D(GTPU,"sending packet size: %d to %s\n",fullSize, inet_ntoa(to.sin_addr) );
int ret;
+
if ((ret=sendto(h, (void *)buffer, (size_t)fullSize, 0,(struct sockaddr *)&to, sizeof(to) )) != fullSize ) {
LOG_E(GTPU, "[SD %d] Failed to send data to " IPV4_ADDR " on port %d, buffer size %u, ret: %d, errno: %d\n",
h, IPV4_ADDR_FORMAT(peerIp), peerPort, fullSize, ret, errno);
@@ -173,7 +174,7 @@ static void gtpv1uSend(instance_t instance, gtpv1u_enb_tunnel_data_req_t *req, b
return;
}
- map<int, ocp_gtpv1u_bearer_t>::iterator ptr2=ptrRnti->second.bearers.find(rab_id);
+ map<int, gtpv1u_bearer_t>::iterator ptr2=ptrRnti->second.bearers.find(rab_id);
if ( ptr2 == ptrRnti->second.bearers.end() ) {
LOG_E(GTPU,"[%ld] GTP-U instance: sending a packet to a non existant RNTI:RAB: %x/%x\n", instance, rnti, rab_id);
@@ -191,12 +192,12 @@ static void gtpv1uSend(instance_t instance, gtpv1u_enb_tunnel_data_req_t *req, b
ptr2->second.npduNum++;
// copy to release the mutex
- ocp_gtpv1u_bearer_t tmp=ptr2->second;
+ gtpv1u_bearer_t tmp=ptr2->second;
pthread_mutex_unlock(&globGtp.gtp_lock);
gtpv1uCreateAndSendMsg(compatInst(instance),
tmp.outgoing_ip_addr,
tmp.outgoing_port,
- GTP_GPDU,
+ GTP_GPDU,
tmp.teid_outgoing,
buffer, length, seqNumFlag, npduNumFlag, false, tmp.seqNum, tmp.npduNum, 0) ;
}
@@ -216,7 +217,7 @@ static void gtpv1uSend2(instance_t instance, gtpv1u_gnb_tunnel_data_req_t *req,
return;
}
- map<int, ocp_gtpv1u_bearer_t>::iterator ptr2=ptrRnti->second.bearers.find(rab_id);
+ map<int, gtpv1u_bearer_t>::iterator ptr2=ptrRnti->second.bearers.find(rab_id);
if ( ptr2 == ptrRnti->second.bearers.end() ) {
LOG_D(GTPU,"GTP-U instance: %ld sending a packet to a non existant RNTI:RAB: %x/%x\n", instance, rnti, rab_id);
@@ -234,12 +235,12 @@ static void gtpv1uSend2(instance_t instance, gtpv1u_gnb_tunnel_data_req_t *req,
ptr2->second.npduNum++;
// copy to release the mutex
- ocp_gtpv1u_bearer_t tmp=ptr2->second;
+ gtpv1u_bearer_t tmp=ptr2->second;
pthread_mutex_unlock(&globGtp.gtp_lock);
gtpv1uCreateAndSendMsg(compatInst(instance),
tmp.outgoing_ip_addr,
tmp.outgoing_port,
- GTP_GPDU,
+ GTP_GPDU,
tmp.teid_outgoing,
buffer, length, seqNumFlag, npduNumFlag, false, tmp.seqNum, tmp.npduNum, 0) ;
}
@@ -257,7 +258,7 @@ static void gtpv1uEndTunnel(instance_t instance, gtpv1u_enb_tunnel_data_req_t *r
return;
}
- map<int, ocp_gtpv1u_bearer_t>::iterator ptr2=ptrRnti->second.bearers.find(rab_id);
+ map<int, gtpv1u_bearer_t>::iterator ptr2=ptrRnti->second.bearers.find(rab_id);
if ( ptr2 == ptrRnti->second.bearers.end() ) {
LOG_E(GTPU,"[%ld] GTP-U sending a packet to a non existant RNTI:RAB: %x/%x\n", instance, rnti, rab_id);
@@ -267,7 +268,7 @@ static void gtpv1uEndTunnel(instance_t instance, gtpv1u_enb_tunnel_data_req_t *r
LOG_D(GTPU,"[%ld] sending a end packet packet to RNTI:RAB:teid %x/%x/%x\n",
instance, rnti, rab_id,ptr2->second.teid_outgoing);
- ocp_gtpv1u_bearer_t tmp=ptr2->second;
+ gtpv1u_bearer_t tmp=ptr2->second;
pthread_mutex_unlock(&globGtp.gtp_lock);
Gtpv1uMsgHeaderT msgHdr;
// N should be 0 for us (it was used only in 2G and 3G)
@@ -309,6 +310,7 @@ static int udpServerSocket(openAddr_s addr) {
LOG_E(GTPU,"getaddrinfo error: %s\n", gai_strerror(status));
return -1;
}
+
int sockfd=-1;
// loop through all the results and bind to the first we can
@@ -383,12 +385,12 @@ static int udpServerSocket(openAddr_s addr) {
return sockfd;
}
-instance_t ocp_gtpv1Init(openAddr_t context) {
+instance_t gtpv1Init(openAddr_t context) {
pthread_mutex_lock(&globGtp.gtp_lock);
int id=udpServerSocket(context);
if (id>=0) {
- itti_subscribe_event_fd(OCP_GTPV1_U, id);
+ itti_subscribe_event_fd(TASK_GTPV1_U, id);
} else
LOG_E(GTPU,"can't create GTP-U instance\n");
@@ -408,7 +410,7 @@ void GtpuUpdateTunnelOutgoingTeid(instance_t instance, rnti_t rnti, ebi_t bearer
return;
}
- map<int, ocp_gtpv1u_bearer_t>::iterator ptr2=ptrRnti->second.bearers.find(bearer_id);
+ map<int, gtpv1u_bearer_t>::iterator ptr2=ptrRnti->second.bearers.find(bearer_id);
if ( ptr2 == ptrRnti->second.bearers.end() ) {
LOG_E(GTPU,"[%ld] Update tunnel for a existing rnti %x, but wrong bearer_id %u\n", instance, rnti, bearer_id);
@@ -447,7 +449,7 @@ teid_t newGtpuCreateTunnel(instance_t instance, rnti_t rnti, int incoming_bearer
inst->te2ue_mapping[incoming_teid].callBack=callBack;
- ocp_gtpv1u_bearer_t *tmp=&inst->ue2te_mapping[rnti].bearers[outgoing_bearer_id];
+ gtpv1u_bearer_t *tmp=&inst->ue2te_mapping[rnti].bearers[outgoing_bearer_id];
int addrs_length_in_bytes = remoteAddr.length / 8;
@@ -487,21 +489,21 @@ teid_t newGtpuCreateTunnel(instance_t instance, rnti_t rnti, int incoming_bearer
return incoming_teid;
}
-int ocp_gtpv1u_create_s1u_tunnel(instance_t instance,
- const gtpv1u_enb_create_tunnel_req_t *create_tunnel_req,
- gtpv1u_enb_create_tunnel_resp_t *create_tunnel_resp) {
+int gtpv1u_create_s1u_tunnel(instance_t instance,
+ const gtpv1u_enb_create_tunnel_req_t *create_tunnel_req,
+ gtpv1u_enb_create_tunnel_resp_t *create_tunnel_resp) {
LOG_D(GTPU, "[%ld] Start create tunnels for RNTI %x, num_tunnels %d, sgw_S1u_teid %x\n",
instance,
create_tunnel_req->rnti,
create_tunnel_req->num_tunnels,
create_tunnel_req->sgw_S1u_teid[0]);
tcp_udp_port_t dstport=globGtp.instances[compatInst(instance)].get_dstport();
+
for (int i = 0; i < create_tunnel_req->num_tunnels; i++) {
AssertFatal(create_tunnel_req->eps_bearer_id[i] > 4,
"From legacy code not clear, seems impossible (bearer=%d)\n",
create_tunnel_req->eps_bearer_id[i]);
int incoming_rb_id=create_tunnel_req->eps_bearer_id[i]-4;
-
teid_t teid=newGtpuCreateTunnel(compatInst(instance), create_tunnel_req->rnti,
incoming_rb_id,
create_tunnel_req->eps_bearer_id[i],
@@ -521,7 +523,7 @@ int ocp_gtpv1u_create_s1u_tunnel(instance_t instance,
return !GTPNOK;
}
-int ocp_gtpv1u_update_s1u_tunnel(
+int gtpv1u_update_s1u_tunnel(
const instance_t instance,
const gtpv1u_enb_create_tunnel_req_t *const create_tunnel_req,
const rnti_t prior_rnti
@@ -546,7 +548,7 @@ int ocp_gtpv1u_update_s1u_tunnel(
LOG_W(GTPU,"[%ld] Update a not existing tunnel, start create the new one (new rnti %x, old rnti %x)\n", instance, create_tunnel_req->rnti, prior_rnti);
pthread_mutex_unlock(&globGtp.gtp_lock);
gtpv1u_enb_create_tunnel_resp_t tmp;
- (void)ocp_gtpv1u_create_s1u_tunnel(instance, create_tunnel_req, &tmp);
+ (void)gtpv1u_create_s1u_tunnel(instance, create_tunnel_req, &tmp);
return 0;
}
@@ -565,11 +567,12 @@ int gtpv1u_create_ngu_tunnel( const instance_t instance,
create_tunnel_req->num_tunnels,
create_tunnel_req->outgoing_teid[0]);
tcp_udp_port_t dstport=globGtp.instances[compatInst(instance)].get_dstport();
+
for (int i = 0; i < create_tunnel_req->num_tunnels; i++) {
teid_t teid=newGtpuCreateTunnel(instance, create_tunnel_req->rnti,
create_tunnel_req->incoming_rb_id[i],
create_tunnel_req->pdusession_id[i],
- create_tunnel_req->outgoing_teid[i],
+ create_tunnel_req->outgoing_teid[i],
create_tunnel_req->dst_addr[i], dstport,
sdap_gnb_data_req);
create_tunnel_resp->status=0;
@@ -593,14 +596,14 @@ int gtpv1u_update_ngu_tunnel(
return GTPNOK;
}
-int ocp_gtpv1u_create_x2u_tunnel(
+int gtpv1u_create_x2u_tunnel(
const instance_t instanceP,
const gtpv1u_enb_create_x2u_tunnel_req_t *const create_tunnel_req_pP,
gtpv1u_enb_create_x2u_tunnel_resp_t *const create_tunnel_resp_pP) {
AssertFatal( false, "to be developped\n");
}
-int newGtpuDeleteTunnel(instance_t instance, rnti_t rnti) {
+int newGtpuDeleteAllTunnels(instance_t instance, rnti_t rnti) {
LOG_D(GTPU, "[%ld] Start delete tunnels for RNTI %x\n",
instance, rnti);
pthread_mutex_lock(&globGtp.gtp_lock);
@@ -630,24 +633,64 @@ int newGtpuDeleteTunnel(instance_t instance, rnti_t rnti) {
// Legacy delete tunnel finish by deleting all the rnti
// so the list of bearer provided is only a design bug
-int ocp_gtpv1u_delete_s1u_tunnel( const instance_t instance,
- const gtpv1u_enb_delete_tunnel_req_t *const req_pP) {
- return newGtpuDeleteTunnel(instance, req_pP->rnti);
+int gtpv1u_delete_s1u_tunnel( const instance_t instance,
+ const gtpv1u_enb_delete_tunnel_req_t *const req_pP) {
+ return newGtpuDeleteAllTunnels(instance, req_pP->rnti);
+}
+
+int newGtpuDeleteTunnels(instance_t instance, rnti_t rnti, int nbTunnels, pdusessionid_t *pdusession_id) {
+ LOG_D(GTPU, "[%ld] Start delete tunnels for RNTI %x\n",
+ instance, rnti);
+ pthread_mutex_lock(&globGtp.gtp_lock);
+ auto inst=&globGtp.instances[compatInst(instance)];
+ auto ptrRNTI=inst->ue2te_mapping.find(rnti);
+
+ if ( ptrRNTI == inst->ue2te_mapping.end() ) {
+ LOG_W(GTPU,"[%ld] Delete GTP tunnels for rnti: %x, but no tunnel exits\n", instance, rnti);
+ pthread_mutex_unlock(&globGtp.gtp_lock);
+ return -1;
+ }
+
+ int nb=0;
+
+ for (int i=0; i<nbTunnels; i++) {
+ auto ptr2=ptrRNTI->second.bearers.find(pdusession_id[i]);
+
+ if ( ptr2 == ptrRNTI->second.bearers.end() ) {
+ LOG_E(GTPU,"[%ld] GTP-U instance: delete of not existing tunnel RNTI:RAB: %x/%x\n", instance, rnti,pdusession_id[i]);
+ } else {
+ inst->te2ue_mapping.erase(ptr2->second.teid_incoming);
+ nb++;
+ }
+ }
+
+ if (ptrRNTI->second.bearers.size() == 0 )
+ // no tunnels on this rnti, erase the ue entry
+ inst->ue2te_mapping.erase(ptrRNTI);
+
+ pthread_mutex_unlock(&globGtp.gtp_lock);
+ LOG_I(GTPU, "[%ld] Deleted all tunnels for RNTI %x (%d tunnels deleted)\n", instance, rnti, nb);
+ return !GTPNOK;
}
int gtpv1u_delete_x2u_tunnel( const instance_t instanceP,
- const gtpv1u_enb_delete_tunnel_req_t *const req_pP,
- int enbflag) {
+ const gtpv1u_enb_delete_tunnel_req_t *const req_pP) {
+ LOG_E(GTPU,"x2 tunnel not implemented\n");
return 0;
}
+int gtpv1u_delete_ngu_tunnel( const instance_t instance,
+ gtpv1u_gnb_delete_tunnel_req_t *req) {
+ return newGtpuDeleteTunnels(instance, req->rnti, req->num_pdusession, req->pdusession_id);
+}
+
static int Gtpv1uHandleEchoReq(int h,
uint8_t *msgBuf,
uint32_t msgBufLen,
uint16_t peerPort,
uint32_t peerIp) {
Gtpv1uMsgHeaderT *msgHdr = (Gtpv1uMsgHeaderT *) msgBuf;
-
+
if ( msgHdr->version != 1 || msgHdr->PT != 1 ) {
LOG_E(GTPU, "[%d] Received a packet that is not GTP header\n", h);
return GTPNOK;
@@ -658,14 +701,12 @@ static int Gtpv1uHandleEchoReq(int h,
return GTPNOK;
}
- uint16_t seq=ntohs(*(uint16_t*)(msgHdr+1));
+ uint16_t seq=ntohs(*(uint16_t *)(msgHdr+1));
LOG_D(GTPU, "[%d] Received a echo request, TEID: %d, seq: %hu\n", h, msgHdr->teid, seq);
- uint8_t recovery[2]={14,0};
-
+ uint8_t recovery[2]= {14,0};
return gtpv1uCreateAndSendMsg(h, peerIp, peerPort, GTP_ECHO_RSP, ntohl(msgHdr->teid),
- recovery, sizeof recovery,
- 1, 0, 0, seq, 0, 0);
-
+ recovery, sizeof recovery,
+ 1, 0, 0, seq, 0, 0);
}
static int Gtpv1uHandleError(int h,
@@ -871,14 +912,14 @@ void gtpv1uReceiver(int h) {
#include <openair2/ENB_APP/enb_paramdef.h>
-void *ocp_gtpv1uTask(void *args) {
+void *gtpv1uTask(void *args) {
while(1) {
/* Trying to fetch a message from the message queue.
If the queue is empty, this function will block till a
message is sent to the task.
*/
MessageDef *message_p = NULL;
- itti_receive_msg(OCP_GTPV1_U, &message_p);
+ itti_receive_msg(TASK_GTPV1_U, &message_p);
if (message_p != NULL ) {
openAddr_t addr= {0};
@@ -888,7 +929,7 @@ void *ocp_gtpv1uTask(void *args) {
case GTPV1U_ENB_TUNNEL_DATA_REQ: {
gtpv1uSend(compatInst(ITTI_MSG_DESTINATION_INSTANCE(message_p)),
>PV1U_ENB_TUNNEL_DATA_REQ(message_p), false, false);
- itti_free(OCP_GTPV1_U, GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).buffer);
+ itti_free(TASK_GTPV1_U, GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).buffer);
}
break;
@@ -908,7 +949,7 @@ void *ocp_gtpv1uTask(void *args) {
case GTPV1U_ENB_END_MARKER_REQ:
gtpv1uEndTunnel(compatInst(ITTI_MSG_DESTINATION_INSTANCE(message_p)),
>PV1U_ENB_TUNNEL_DATA_REQ(message_p));
- itti_free(OCP_GTPV1_U, GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).buffer);
+ itti_free(TASK_GTPV1_U, GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).buffer);
break;
case GTPV1U_ENB_DATA_FORWARDING_REQ:
@@ -923,7 +964,7 @@ void *ocp_gtpv1uTask(void *args) {
strcpy(addr.originHost, GTPV1U_REQ(message_p).localAddrStr);
strcpy(addr.originService, GTPV1U_REQ(message_p).localPortStr);
strcpy(addr.destinationService,addr.originService);
- AssertFatal((legacyInstanceMapping=ocp_gtpv1Init(addr))!=0,"Instance 0 reserved for legacy\n");
+ AssertFatal((legacyInstanceMapping=gtpv1Init(addr))!=0,"Instance 0 reserved for legacy\n");
break;
default:
@@ -932,12 +973,12 @@ void *ocp_gtpv1uTask(void *args) {
break;
}
- AssertFatal(EXIT_SUCCESS==itti_free(OCP_GTPV1_U, message_p), "Failed to free memory!\n");
+ AssertFatal(EXIT_SUCCESS==itti_free(TASK_GTPV1_U, message_p), "Failed to free memory!\n");
}
struct epoll_event *events;
- int nb_events = itti_get_events(OCP_GTPV1_U, &events);
+ int nb_events = itti_get_events(TASK_GTPV1_U, &events);
for (int i = 0; i < nb_events; i++)
if ((events[i].events&EPOLLIN))
diff --git a/openair3/ocp-gtpu/gtp_itf.h b/openair3/ocp-gtpu/gtp_itf.h
index 3893acf40f0416b98b153b70e9b6153d79d49b09..ba6cf0f8bb98e3da99af0e7c4162c5fe2ffb731d 100644
--- a/openair3/ocp-gtpu/gtp_itf.h
+++ b/openair3/ocp-gtpu/gtp_itf.h
@@ -8,19 +8,6 @@
extern "C" {
#endif
-#include <openair3/GTPV1-U/gtpv1u_eNB_defs.h>
-#if defined(NEW_GTPU)
-#define gtpv1u_create_s1u_tunnel ocp_gtpv1u_create_s1u_tunnel
-#define gtpv1u_update_s1u_tunnel ocp_gtpv1u_update_s1u_tunnel
-#define gtpv1u_delete_s1u_tunnel ocp_gtpv1u_delete_s1u_tunnel
-#define gtpv1u_create_x2u_tunnel ocp_gtpv1u_create_x2u_tunnel
-#define gtpv1u_eNB_task ocp_gtpv1uTask
-#define nr_gtpv1u_gNB_task ocp_gtpv1uTask
-#define TASK_VARIABLE OCP_GTPV1_U
-#else
-#define TASK_VARIABLE TASK_GTPV1_U
-#endif
-
typedef boolean_t (*gtpCallback)(
protocol_ctxt_t *ctxt_pP,
const srb_flag_t srb_flagP,
@@ -32,7 +19,7 @@ typedef boolean_t (*gtpCallback)(
const pdcp_transmission_mode_t modeP,
const uint32_t *sourceL2Id,
const uint32_t *destinationL2Id);
-
+
typedef struct openAddr_s {
char originHost[HOST_NAME_MAX];
char originService[HOST_NAME_MAX];
@@ -43,18 +30,18 @@ typedef struct openAddr_s {
// the init function create a gtp instance and return the gtp instance id
// the parameter originInstance will be sent back in each message from gtp to the creator
-void ocp_gtpv1uReceiver(int h);
-void ocp_gtpv1uProcessTimeout(int handle,void *arg);
-int ocp_gtpv1u_create_s1u_tunnel(const instance_t instance, const gtpv1u_enb_create_tunnel_req_t *create_tunnel_req,
- gtpv1u_enb_create_tunnel_resp_t *create_tunnel_resp);
-int ocp_gtpv1u_update_s1u_tunnel(const instance_t instanceP,
- const gtpv1u_enb_create_tunnel_req_t *create_tunnel_req_pP,
- const rnti_t prior_rnti
- );
-int ocp_gtpv1u_delete_s1u_tunnel( const instance_t instance, const gtpv1u_enb_delete_tunnel_req_t *const req_pP);
+void gtpv1uReceiver(int h);
+void gtpv1uProcessTimeout(int handle,void *arg);
+int gtpv1u_create_s1u_tunnel(const instance_t instance, const gtpv1u_enb_create_tunnel_req_t *create_tunnel_req,
+ gtpv1u_enb_create_tunnel_resp_t *create_tunnel_resp);
+int gtpv1u_update_s1u_tunnel(const instance_t instanceP,
+ const gtpv1u_enb_create_tunnel_req_t *create_tunnel_req_pP,
+ const rnti_t prior_rnti
+ );
+int gtpv1u_delete_s1u_tunnel( const instance_t instance, const gtpv1u_enb_delete_tunnel_req_t *const req_pP);
int gtpv1u_delete_s1u_tunnel( const instance_t instance, const gtpv1u_enb_delete_tunnel_req_t *const req_pP);
-int ocp_gtpv1u_create_x2u_tunnel(
+int gtpv1u_create_x2u_tunnel(
const instance_t instanceP,
const gtpv1u_enb_create_x2u_tunnel_req_t *const create_tunnel_req_pP,
gtpv1u_enb_create_x2u_tunnel_resp_t *const create_tunnel_resp_pP);
@@ -64,8 +51,10 @@ int ocp_gtpv1u_create_x2u_tunnel(
teid_t newGtpuCreateTunnel(instance_t instance, rnti_t rnti, int incoming_bearer_id, int outgoing_rb_id, teid_t teid,
transport_layer_addr_t remoteAddr, int port, gtpCallback callBack);
void GtpuUpdateTunnelOutgoingTeid(instance_t instance, rnti_t rnti, ebi_t bearer_id, teid_t newOutgoingTeid);
-instance_t ocp_gtpv1Init(openAddr_t context);
-void *ocp_gtpv1uTask(void *args);
+int newGtpuDeleteAllTunnels(instance_t instance, rnti_t rnti);
+int newGtpuDeleteTunnels(instance_t instance, rnti_t rnti, int nbTunnels, pdusessionid_t *pdusession_id);
+instance_t gtpv1Init(openAddr_t context);
+void *gtpv1uTask(void *args);
#ifdef __cplusplus
}
diff --git a/openair3/GTPV1-U/gtpv1u_eNB_defs.h b/openair3/ocp-gtpu/gtpv1u_eNB_task.h
similarity index 59%
rename from openair3/GTPV1-U/gtpv1u_eNB_defs.h
rename to openair3/ocp-gtpu/gtpv1u_eNB_task.h
index fb317e4ca6ff8bc7b8e9b4fa28a243d6b6bf6ceb..e764eb143b141b70c00f5b6ab5a32ae80fb84f8b 100644
--- a/openair3/GTPV1-U/gtpv1u_eNB_defs.h
+++ b/openair3/ocp-gtpu/gtpv1u_eNB_task.h
@@ -19,32 +19,23 @@
* contact@openairinterface.org
*/
-/*! \file gtpv1u_eNB_defs.h
- * \brief
- * \author Sebastien ROUX, Lionel GAUTHIER
- * \version 1.0
- * \company Eurecom
- * \email: lionel.gauthier@eurecom.fr
- */
-
-#include "hashtable.h"
-#include "LTE_asn_constant.h"
+/*! \file gtpv1u_eNB_task.h
+* \brief
+* \author Lionel Gauthier
+* \company Eurecom
+* \email: lionel.gauthier@eurecom.fr
+*/
-#ifndef GTPV1U_ENB_DEFS_H_
-#define GTPV1U_ENB_DEFS_H_
+#ifndef GTPV1U_ENB_TASK_H_
+#define GTPV1U_ENB_TASK_H_
-#include "NwGtpv1u.h"
+typedef struct gtpv1u_data_s {
+ /* RB tree of UEs */
+ hash_table_t *ue_mapping;
+} gtpv1u_data_t;
-#define GTPV1U_UDP_PORT (2152)
#define GTPV1U_BEARER_OFFSET 3
-
#define GTPV1U_MAX_BEARERS_ID (max_val_LTE_DRB_Identity - GTPV1U_BEARER_OFFSET)
-
-#define GTPV1U_SOURCE_ENB (0)
-#define GTPV1U_TARGET_ENB (1)
-#define GTPV1U_MSG_FROM_SOURCE_ENB (0)
-#define GTPV1U_MSG_FROM_SPGW (1)
-
typedef enum {
BEARER_DOWN = 0,
BEARER_IN_CONFIG,
@@ -54,16 +45,7 @@ typedef enum {
BEARER_MAX,
} bearer_state_t;
-
-typedef struct gtpv1u_teid_data_s {
- /* UE identifier for oaisim stack */
- module_id_t enb_id;
- rnti_t ue_id;
- ebi_t eps_bearer_id;
-} gtpv1u_teid_data_t;
-
-
-typedef struct gtpv1u_bearer_s {
+typedef struct fixMe_gtpv1u_bearer_s {
/* TEID used in dl and ul */
teid_t teid_eNB; ///< eNB TEID
uintptr_t teid_eNB_stack_session; ///< eNB TEID
@@ -71,12 +53,12 @@ typedef struct gtpv1u_bearer_s {
in_addr_t sgw_ip_addr;
struct in6_addr sgw_ip6_addr;
teid_t teid_teNB;
- in_addr_t tenb_ip_addr; ///< target eNB ipv4
- struct in6_addr tenb_ip6_addr; ///< target eNB ipv6
+ in_addr_t tenb_ip_addr; ///< target eNB ipv4
+ struct in6_addr tenb_ip6_addr; ///< target eNB ipv6
tcp_udp_port_t port;
//NwGtpv1uStackSessionHandleT stack_session;
bearer_state_t state;
-} gtpv1u_bearer_t;
+} fixMe_gtpv1u_bearer_t;
typedef struct gtpv1u_ue_data_s {
/* UE identifier for oaisim stack */
@@ -89,45 +71,43 @@ typedef struct gtpv1u_ue_data_s {
* Note that the first LCID available for data is 3 and we fixed the maximum
* number of e-rab per UE to be (32 [id range]), max RB is 11. The real rb id will 3 + rab_id (3..32).
*/
- gtpv1u_bearer_t bearers[GTPV1U_MAX_BEARERS_ID];
+ fixMe_gtpv1u_bearer_t bearers[GTPV1U_MAX_BEARERS_ID];
//RB_ENTRY(gtpv1u_ue_data_s) gtpv1u_ue_node;
} gtpv1u_ue_data_t;
+/*
+int
+gtpv1u_new_data_req(
+ uint8_t enb_id,
+ uint8_t ue_id,
+ uint8_t rab_id,
+ uint8_t *buffer,
+ uint32_t buf_len,
+ uint32_t buf_offset);*/
-typedef struct gtpv1u_data_s {
- /* nwgtpv1u stack internal data */
- NwGtpv1uStackHandleT gtpv1u_stack;
-
- /* RB tree of UEs */
- hash_table_t *ue_mapping; // PDCP->GTPV1U
- hash_table_t *teid_mapping; // GTPV1U -> PDCP
-
- //RB_HEAD(gtpv1u_ue_map, gtpv1u_ue_data_s) gtpv1u_ue_map_head;
- /* Local IP address to use */
- in_addr_t enb_ip_address_for_S1u_S12_S4_up;
- /* UDP internal data */
- //udp_data_t udp_data;
-
- uint16_t seq_num;
- uint8_t restart_counter;
-
-} gtpv1u_data_t;
+int gtpv1u_eNB_init(void);
+void *gtpv1u_eNB_process_itti_msg(void *);
+void *gtpv1u_eNB_task(void *args);
int
-gtpv1u_new_data_req(
- uint8_t enb_module_idP,
- rnti_t ue_rntiP,
- uint8_t rab_idP,
- uint8_t *buffer_pP,
- uint32_t buf_lenP,
- uint32_t buf_offsetP
-);
+gtpv1u_create_x2u_tunnel(
+ const instance_t instanceP,
+ const gtpv1u_enb_create_x2u_tunnel_req_t *const create_tunnel_req_pP,
+ gtpv1u_enb_create_x2u_tunnel_resp_t *const create_tunnel_resp_pP);
int
-gtpv1u_initial_req(
- gtpv1u_data_t *gtpv1u_data_p,
- uint32_t teid,
- uint16_t port,
- uint32_t address);
+gtpv1u_create_s1u_tunnel(
+ const instance_t instanceP,
+ const gtpv1u_enb_create_tunnel_req_t *const create_tunnel_req_pP,
+ gtpv1u_enb_create_tunnel_resp_t *const create_tunnel_resp_pP);
-#endif /* GTPV1U_ENB_DEFS_H_ */
+int
+gtpv1u_update_s1u_tunnel(
+ const instance_t instanceP,
+ const gtpv1u_enb_create_tunnel_req_t *const create_tunnel_req_pP,
+ const rnti_t prior_rnti);
+
+int gtpv1u_delete_x2u_tunnel(
+ const instance_t instanceP,
+ const gtpv1u_enb_delete_tunnel_req_t *const req_pP);
+#endif /* GTPV1U_ENB_TASK_H_ */
diff --git a/openair3/GTPV1-U/gtpv1u_gNB_task.h b/openair3/ocp-gtpu/gtpv1u_gNB_task.h
similarity index 86%
rename from openair3/GTPV1-U/gtpv1u_gNB_task.h
rename to openair3/ocp-gtpu/gtpv1u_gNB_task.h
index fcfaa90304fae93b8094f15af132d81033d86c41..817d0109ba6d7ebc399d7b27060a3f71be45810f 100644
--- a/openair3/GTPV1-U/gtpv1u_gNB_task.h
+++ b/openair3/ocp-gtpu/gtpv1u_gNB_task.h
@@ -37,8 +37,8 @@ void *nr_gtpv1u_gNB_task(void *args);
int
gtpv1u_create_ngu_tunnel(
const instance_t instanceP,
- const gtpv1u_gnb_create_tunnel_req_t * const create_tunnel_req_pP,
- gtpv1u_gnb_create_tunnel_resp_t * const create_tunnel_resp_pP);
+ const gtpv1u_gnb_create_tunnel_req_t *const create_tunnel_req_pP,
+ gtpv1u_gnb_create_tunnel_resp_t *const create_tunnel_resp_pP);
int
gtpv1u_update_ngu_tunnel(
@@ -47,5 +47,8 @@ gtpv1u_update_ngu_tunnel(
const rnti_t prior_rnti
);
+int gtpv1u_delete_ngu_tunnel( const instance_t instance,
+ gtpv1u_gnb_delete_tunnel_req_t *req);
+
#endif /* GTPV1U_GNB_TASK_H_ */
diff --git a/targets/ARCH/AW2SORI/oaiori.c b/targets/ARCH/AW2SORI/oaiori.c
index 9cf15237cface89002ae637ff0a8f2b9731e971b..fc35e021b8fcbe164b8745da23a63ba0460c0518 100644
--- a/targets/ARCH/AW2SORI/oaiori.c
+++ b/targets/ARCH/AW2SORI/oaiori.c
@@ -420,7 +420,7 @@ int aw2s_startstreaming(openair0_device *device) {
{}*/
// test RX interface
uint64_t TS;
- char temp_rx[1024] __attribute__((aligned(32)));
+ char temp_rx[2048] __attribute__((aligned(32)));
int aid,r0=0,r1=(openair0_cfg->rx_num_channels > 1) ? 0 : 1;
int r2=(openair0_cfg->rx_num_channels > 2) ? 0 : 1;
int r3=(openair0_cfg->rx_num_channels > 3) ? 0 : 1;
diff --git a/targets/ARCH/COMMON/record_player.c b/targets/ARCH/COMMON/record_player.c
index 522f6b6d166e7aa7a60f28f2e92cd0f28c1772ef..37f985b6b29c4320f7ca417e29df9f71c04c0be9 100644
--- a/targets/ARCH/COMMON/record_player.c
+++ b/targets/ARCH/COMMON/record_player.c
@@ -58,10 +58,9 @@ int read_recplayconfig(recplay_conf_t **recplay_conf, recplay_state_t **recplay_
// Use mmap for IQ files for systems with less than 6GB total RAM
sysinfo(&systeminfo);
- if (systeminfo.totalram < 6144000000) {
- (*recplay_state)->use_mmap = 0;
- } else {
- (*recplay_state)->use_mmap = 1;
+ if (systeminfo.totalram < 6144000000 && ((*recplay_conf)->use_mmap == 1)) {
+ LOG_W(HW,"System with %f GB of mem (<6GB), mmap usage disabled\n",systeminfo.totalram/10E9);
+ (*recplay_conf)->use_mmap = 0;
}
} else { /* record player enabled */
free(*recplay_conf);
diff --git a/targets/ARCH/COMMON/record_player.h b/targets/ARCH/COMMON/record_player.h
index d91da6832308eb8db2dfa949feb39f44a0eaf030..9310355e5b0c4fea9b037ad1b6f16c8a632e1064 100644
--- a/targets/ARCH/COMMON/record_player.h
+++ b/targets/ARCH/COMMON/record_player.h
@@ -78,7 +78,7 @@ typedef struct {
#define CONFIG_HLP_SF_LOOPS "Number of loops to replay of the entire subframes file"
#define CONFIG_HLP_SF_RDELAY "Delay in microseconds to read a subframe in replay mode"
#define CONFIG_HLP_SF_WDELAY "Delay in microseconds to write a subframe in replay mode"
-
+#define CONFIG_HLP_USE_MMAP "In replay mode, map iq file in memory before replaying"
/* keyword strings for config options, used in CMDLINE_XXX_DESC macros and printed when -h option is used */
#define CONFIG_OPT_SF_FILE "subframes-file"
#define CONFIG_OPT_SF_REC "subframes-record"
@@ -87,7 +87,7 @@ typedef struct {
#define CONFIG_OPT_SF_LOOPS "subframes-loops"
#define CONFIG_OPT_SF_RDELAY "subframes-read-delay"
#define CONFIG_OPT_SF_WDELAY "subframes-write-delay"
-
+#define CONFIG_OPT_USE_MMAP "use-mmap"
#define DEVICE_RECPLAY_SECTION "device.recplay"
/* For information only - the macro is not usable in C++ */
/*---------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
@@ -95,13 +95,14 @@ typedef struct {
/* optname helpstr paramflags XXXptr defXXXval type numelt */
/*---------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
#define DEVICE_RECPLAY_PARAMS_DESC { \
- {CONFIG_OPT_SF_FILE, CONFIG_HLP_SF_FILE, 0, strptr:(char **)((*recplay_conf)->u_sf_filename), defstrval:DEF_SF_FILE, TYPE_STRING, 1024}, \
- {CONFIG_OPT_SF_REC, CONFIG_HLP_SF_REC, PARAMFLAG_BOOL, uptr:&(u_sf_record), defuintval:0, TYPE_UINT, 0}, \
- {CONFIG_OPT_SF_REP, CONFIG_HLP_SF_REP, PARAMFLAG_BOOL, uptr:&(u_sf_replay), defuintval:0, TYPE_UINT, 0}, \
+ {CONFIG_OPT_SF_FILE, CONFIG_HLP_SF_FILE, 0, strptr:(char **)((*recplay_conf)->u_sf_filename), defstrval:DEF_SF_FILE, TYPE_STRING, 1024}, \
+ {CONFIG_OPT_SF_REC, CONFIG_HLP_SF_REC, PARAMFLAG_BOOL, uptr:&(u_sf_record), defuintval:0, TYPE_UINT, 0}, \
+ {CONFIG_OPT_SF_REP, CONFIG_HLP_SF_REP, PARAMFLAG_BOOL, uptr:&(u_sf_replay), defuintval:0, TYPE_UINT, 0}, \
{CONFIG_OPT_SF_MAX, CONFIG_HLP_SF_MAX, 0, uptr:&((*recplay_conf)->u_sf_max), defintval:DEF_NB_SF, TYPE_UINT, 0}, \
{CONFIG_OPT_SF_LOOPS, CONFIG_HLP_SF_LOOPS, 0, uptr:&((*recplay_conf)->u_sf_loops), defintval:DEF_SF_NB_LOOP, TYPE_UINT, 0}, \
{CONFIG_OPT_SF_RDELAY, CONFIG_HLP_SF_RDELAY, 0, uptr:&((*recplay_conf)->u_sf_read_delay), defintval:DEF_SF_DELAY_READ, TYPE_UINT, 0}, \
{CONFIG_OPT_SF_WDELAY, CONFIG_HLP_SF_WDELAY, 0, uptr:&((*recplay_conf)->u_sf_write_delay), defintval:DEF_SF_DELAY_WRITE, TYPE_UINT, 0}, \
+ {CONFIG_OPT_USE_MMAP, CONFIG_HLP_USE_MMAP, PARAMFLAG_BOOL, uptr:&((*recplay_conf)->use_mmap), defuintval:1, TYPE_UINT, 0}, \
}/*! \brief Record Player Configuration and state */
typedef struct {
char u_sf_filename[1024]; // subframes file path
@@ -109,10 +110,10 @@ typedef struct {
unsigned int u_sf_loops ; // number of loops in replay mode
unsigned int u_sf_read_delay; // read delay in replay mode
unsigned int u_sf_write_delay ; // write delay in replay mode
+ unsigned int use_mmap; // default is to use mmap
} recplay_conf_t;
typedef struct {
- int use_mmap; // default is to use mmap
size_t mapsize;
FILE *pFile;
int fd;
diff --git a/targets/ARCH/iqplayer/DOC/iqrecordplayer_usage.md b/targets/ARCH/iqplayer/DOC/iqrecordplayer_usage.md
index a6e4138e8ebf8102b56e4acabcbe39dc39308e58..6ccdca3bfa5bfcb2a6ed40b898d31e19a1a70950 100644
--- a/targets/ARCH/iqplayer/DOC/iqrecordplayer_usage.md
+++ b/targets/ARCH/iqplayer/DOC/iqrecordplayer_usage.md
@@ -1,7 +1,7 @@
# I/Q record-playback
## using the iq recorder or iq player
-This feature provides I/Q record-playback as presented in the 4th OAI workshop. Tests have only been performed with a eNB, but the implementation should allow any softmodem executable to use the iq's record/player.
+This feature provides I/Q record-playback as presented in the 4th OAI workshop. The implementation allows any softmodem executable to use the iq's record/player.
The I/Q record/playback feature is briefly described hereafter, it allows you to:
* record subframes received by the USRP board in a file while the system is operating (for example you can record a full UE connection/traffic/ disconnection sequence). Today the oai USRP device is the only one supporting the recording feature.
* replay subframes from a file to operate the system (possibly in multiple loops if the recorded sequence is convenient from the logical point of view).
@@ -75,7 +75,7 @@ U[HW]I ru thread Writing file header to /tmp/iqfile
```
### Playback/replay mode
-The option works only for 5MHz bandwidth because the information stored in the iq's file header regarding bandwidth is not yet properly processed.
+When replaying iq's received by eNB or gNB The option works only for 5MHz bandwidth because the information stored in the iq's file header regarding bandwidth is not yet properly processed.
In this version, mismatch between file content and run time parameters might lead to unpredictable results. In addition a file recorded on a AVX2-capable processor cannot be replayed on a non-AVX2-capable processor (this is to be further investigated).
options for replay mode are:
* `subframes-replay` Activate replay mode
@@ -83,6 +83,7 @@ options for replay mode are:
* `subframes-loops` Number of iterations to replay the entire subframes file (default is 5)
* `subframes-read-delay` Delay in microseconds to read a subframe in replay mode (default 200)
* `subframes-write-delay` Delay in milliseconds to write a subframe in replay mode (default 15)
+* `use-mmap` Boolean, set to 1 (true) by default, iq file is map to memory if true, otherwise iq's are read from file.
>iq player session example:
```bash
diff --git a/targets/ARCH/iqplayer/iqplayer_lib.c b/targets/ARCH/iqplayer/iqplayer_lib.c
index 8b6844f9d3f5bfaa2df87ae236cf997ae874ac48..b62c1935d36967c88da984536846a60b9a9f7ca0 100644
--- a/targets/ARCH/iqplayer/iqplayer_lib.c
+++ b/targets/ARCH/iqplayer/iqplayer_lib.c
@@ -68,19 +68,18 @@ static int iqplayer_loadfile(openair0_device *device, openair0_config_t *openair
exit(-1);
}
- if (s->use_mmap) {
+ if (c->use_mmap) {
// use mmap
s->mapsize=sb.st_size;
LOG_I(HW,"Loading subframes using mmap() from %s size=%lu bytes ...\n",c->u_sf_filename, (uint64_t)sb.st_size );
void *mptr = mmap(NULL, sb.st_size, PROT_WRITE, MAP_PRIVATE, s->fd, 0) ;
- s->ms_sample = (iqrec_t *) ( mmap(NULL, sb.st_size, PROT_WRITE, MAP_PRIVATE, s->fd, 0) + sizeof(iqfile_header_t));
-
if (mptr != MAP_FAILED) {
+ s->ms_sample = (iqrec_t *) ( mptr + sizeof(iqfile_header_t));
parse_iqfile_header(device, (iqfile_header_t *)mptr);
s->ms_sample = (iqrec_t *)((char *)mptr + sizeof(iqfile_header_t));
LOG_I(HW,"Loaded %u subframes.\n",s->nbSamplesBlocks );
} else {
- LOG_E(HW,"Cannot mmap file, exiting.\n");
+ LOG_E(HW,"Cannot mmap file, exiting, errnor %s\n",strerror(errno));
close(s->fd);
exit(-1);
}
@@ -108,7 +107,7 @@ static int iqplayer_loadfile(openair0_device *device, openair0_config_t *openair
if (lseek(s->fd,sizeof(iqfile_header_t), SEEK_SET) == 0) {
LOG_I(HW,"Initial seek at beginning of the file\n" );
} else {
- LOG_I(HW,"Problem initial seek at beginning of the file\n");
+ LOG_I(HW,"Problem initial seek at beginning of the file, %s\n",strerror(errno));
}
} else {
LOG_E(HW,"Cannot read header in %s exiting.\n",c->u_sf_filename );
@@ -134,11 +133,10 @@ static int trx_iqplayer_start(openair0_device *device) {
static void trx_iqplayer_end(openair0_device *device) {
if (device == NULL)
return;
-
if (device->recplay_state == NULL)
return;
- if (device->recplay_state->use_mmap) {
+ if (device->openair0_cfg->recplay_conf->use_mmap) {
if (device->recplay_state->ms_sample != MAP_FAILED) {
munmap(device->recplay_state->ms_sample, device->recplay_state->mapsize);
}
@@ -201,21 +199,22 @@ static int trx_iqplayer_read(openair0_device *device, openair0_timestamp *ptimes
LOG_I(HW,"go back at the beginning of IQ file");
device->recplay_state->currentPtr=(uint8_t *)device->recplay_state->ms_sample;
- if (!s->use_mmap) {
- if (lseek(device->recplay_state->fd, 0, SEEK_SET) != 0) {
- LOG_E(HW, "Problem seeking at the beginning of IQ file");
- }
+ if (!(device->openair0_cfg->recplay_conf->use_mmap) ) {
+ close(device->recplay_state->fd);
+ iqplayer_loadfile(device, device->openair0_cfg);
+ // LOG_E(HW, "Problem seeking at the beginning of IQ file %s\n",strerror(errno));
+
}
}
- if (!s->use_mmap) {
+ if (!(device->openair0_cfg->recplay_conf->use_mmap)) {
// read sample from file
if (read(s->fd, s->ms_sample, sizeof(iqrec_t)) != sizeof(iqrec_t)) {
- LOG_E(HW,"pb reading iqfile at index %lu\n",sizeof(iqrec_t)*s->curSamplesBlock );
+ LOG_E(HW,"pb reading iqfile at index %lu %s\n",sizeof(iqrec_t)*s->curSamplesBlock, strerror(errno) );
exit(-1);
} else {
if (read(s->fd, s->ms_sample+1, s->ms_sample->nbBytes) != s->ms_sample->nbBytes) {
- LOG_E(HW,"pb reading iqfile at index %lu\n",sizeof(iqrec_t)*s->curSamplesBlock );
+ LOG_E(HW,"pb reading iqfile at index %lu %s\n",sizeof(iqrec_t)*s->curSamplesBlock, strerror(errno) );
exit(-1);
}
}
@@ -225,7 +224,9 @@ static int trx_iqplayer_read(openair0_device *device, openair0_timestamp *ptimes
AssertFatal(curHeader->header==BELL_LABS_IQ_HEADER,"" );
// the current timestamp is the stored timestamp until we wrap on input
// USRP shifts 1 sample time to time
- AssertFatal(s->wrap_count !=0 || abs(curHeader->ts-s->currentTs) < 5 ,"");
+ if (s->wrap_count !=0 && device->openair0_cfg->recplay_conf->use_mmap)
+ AssertFatal( abs(curHeader->ts-s->currentTs) < 5 ,
+ "wrap_count=%li, ts %lu %lu",s->wrap_count,curHeader->ts,s->currentTs);
AssertFatal(nsamps*4==curHeader->nbBytes,"");
*ptimestamp = s->currentTs;
memcpy(buff[0], curHeader+1, nsamps*4);
@@ -233,7 +234,7 @@ static int trx_iqplayer_read(openair0_device *device, openair0_timestamp *ptimes
// Prepare for next read
s->currentTs+=nsamps;
- if (s->use_mmap)
+ if (device->openair0_cfg->recplay_conf->use_mmap)
s->currentPtr+=sizeof(iqrec_t)+s->ms_sample->nbBytes;
struct timespec req;
diff --git a/targets/COMMON/create_tasks.c b/targets/COMMON/create_tasks.c
index 4463228dc7386d850d4af8b044966c998d270c8f..a6ae906d9d950fdbf9f20e1551e78408704454e7 100644
--- a/targets/COMMON/create_tasks.c
+++ b/targets/COMMON/create_tasks.c
@@ -28,7 +28,6 @@
#include "sctp_eNB_task.h"
#include "x2ap_eNB.h"
#include "s1ap_eNB.h"
- #include "udp_eNB_task.h"
#include "gtpv1u_eNB_task.h"
#if ENABLE_RAL
#include "lteRALue.h"
@@ -67,11 +66,7 @@ int create_tasks(uint32_t enb_nb) {
if (EPC_MODE_ENABLED && !NODE_IS_DU(type) && ! ( split73==SPLIT73_DU ) ) {
rc = itti_create_task(TASK_S1AP, s1ap_eNB_task, NULL);
AssertFatal(rc >= 0, "Create task for S1AP failed\n");
- if (!(get_softmodem_params()->emulate_rf)){
- rc = itti_create_task(TASK_UDP, udp_eNB_task, NULL);
- AssertFatal(rc >= 0, "Create task for UDP failed\n");
- }
- rc = itti_create_task(TASK_GTPV1_U, gtpv1u_eNB_task, NULL);
+ rc = itti_create_task(TASK_GTPV1_U, gtpv1uTask, NULL);
AssertFatal(rc >= 0, "Create task for GTPV1U failed\n");
}
@@ -91,7 +86,7 @@ int create_tasks(uint32_t enb_nb) {
rc = itti_create_task(TASK_DU_F1, F1AP_DU_task, NULL);
AssertFatal(rc >= 0, "Create task for DU F1AP failed\n");
// DU is now GTP-U instead of protobuf
- rc = itti_create_task(TASK_GTPV1_U, gtpv1u_eNB_task, NULL);
+ rc = itti_create_task(TASK_GTPV1_U, gtpv1uTask, NULL);
AssertFatal(rc >= 0, "Create task for GTPV1U failed\n");
}
diff --git a/targets/COMMON/create_tasks_mbms.c b/targets/COMMON/create_tasks_mbms.c
index 1cd3bb2f3a75747ca4adfd9a58c3cd8eba0ef370..b82b4f158b18a4b1cf499a30018b91e203c2d68d 100644
--- a/targets/COMMON/create_tasks_mbms.c
+++ b/targets/COMMON/create_tasks_mbms.c
@@ -28,7 +28,6 @@
#include "sctp_eNB_task.h"
#include "x2ap_eNB.h"
#include "s1ap_eNB.h"
- #include "udp_eNB_task.h"
#include "gtpv1u_eNB_task.h"
#include "m2ap_eNB.h"
#include "m2ap_MCE.h"
@@ -75,46 +74,10 @@ int create_tasks_mbms(uint32_t enb_nb) {
rc = itti_create_task (TASK_MCE_APP, MCE_app_task, NULL);
AssertFatal(rc >= 0, "Create task for MCE APP failed\n");
-
-// LOG_I(ENB_APP, "Creating ENB_APP eNB Task\n");
-// rc = itti_create_task (TASK_ENB_APP, eNB_app_task, NULL);
-// AssertFatal(rc >= 0, "Create task for eNB APP failed\n");
-//
-// LOG_I(RRC,"Creating RRC eNB Task\n");
-// rc = itti_create_task (TASK_RRC_ENB, rrc_enb_task, NULL);
-// AssertFatal(rc >= 0, "Create task for RRC eNB failed\n");
-//
-// if (EPC_MODE_ENABLED) {
-// rc = itti_create_task(TASK_SCTP, sctp_eNB_task, NULL);
-// AssertFatal(rc >= 0, "Create task for SCTP failed\n");
-// }
-// rc = itti_create_task(TASK_SCTP, sctp_eNB_task, NULL);
-// AssertFatal(rc >= 0, "Create task for SCTP failed\n");
-//
-//
-// if (EPC_MODE_ENABLED && !NODE_IS_DU(type)) {
-// rc = itti_create_task(TASK_S1AP, s1ap_eNB_task, NULL);
-// AssertFatal(rc >= 0, "Create task for S1AP failed\n");
-// if (!(get_softmodem_params()->emulate_rf)){
-// rc = itti_create_task(TASK_UDP, udp_eNB_task, NULL);
-// AssertFatal(rc >= 0, "Create task for UDP failed\n");
-// }
-// rc = itti_create_task(TASK_GTPV1_U, gtpv1u_eNB_task, NULL);
-// AssertFatal(rc >= 0, "Create task for GTPV1U failed\n");
-// if (is_x2ap_enabled()) {
-// rc = itti_create_task(TASK_X2AP, x2ap_task, NULL);
-// AssertFatal(rc >= 0, "Create task for X2AP failed\n");
-// } else {
-// LOG_I(X2AP, "X2AP is disabled.\n");
-// }
-// }
-////
if(!EPC_MODE_ENABLED){
// rc = itti_create_task(TASK_SCTP, sctp_eNB_task, NULL);
// AssertFatal(rc >= 0, "Create task for SCTP failed\n");
- rc = itti_create_task(TASK_UDP, udp_eNB_task, NULL);
- AssertFatal(rc >= 0, "Create task for UDP failed\n");
- rc = itti_create_task(TASK_GTPV1_U, gtpv1u_eNB_task, NULL);
+ rc = itti_create_task(TASK_GTPV1_U, gtpv1uTask, NULL);
AssertFatal(rc >= 0, "Create task for GTPV1U failed\n");
}
///
diff --git a/targets/COMMON/create_tasks_ue.c b/targets/COMMON/create_tasks_ue.c
index 9341107af9bd53bb68132e1080a6103fc5054e49..cdca62c39900a2eb63f13f3d3a9b1649f841c17a 100644
--- a/targets/COMMON/create_tasks_ue.c
+++ b/targets/COMMON/create_tasks_ue.c
@@ -27,7 +27,6 @@
#include "sctp_eNB_task.h"
#include "s1ap_eNB.h"
#include "openair3/NAS/UE/nas_ue_task.h"
- #include "udp_eNB_task.h"
#include "gtpv1u_eNB_task.h"
#if ENABLE_RAL
#include "lteRALue.h"
diff --git a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
index 84c669571c2526b5456bec3288213d021ae7986a..0e88f490218dd748c0c04cf41d2ae3ada2b45766 100644
--- a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
+++ b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
@@ -70,23 +70,15 @@ eNBs =
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
# available options for level: error, warn, notice, info, debug, trace
-# available options for verbosity: none, low, medium, high, full
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="debug";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="debug";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf
index aab3876d96355f60c890815876e06132544b4809..0561c563ddb70e769791d3a3f780ee1dfd5dd590 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf
@@ -269,17 +269,10 @@ NETWORK_CONTROLLER :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf
index 575fddda2b11614a23957930f4da58f1c73f0248..f13f20efbab0eba909eac48ade4f9fb2e773fad9 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf
@@ -263,18 +263,11 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf
index 38d3f5eac94756b771e33575de9969b9ce42c55b..0e1080043a0ed8d1113be91c9fdffef575d660c9 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf
@@ -200,15 +200,10 @@ eNBs = (
log_config = {
global_log_level = "info";
- global_log_verbosity = "medium";
pdcp_log_level = "info";
- pdcp_log_verbosity = "high";
rrc_log_level = "info";
- rrc_log_verbosity = "medium";
flexran_agent_log_level = "info";
- flexran_agent_log_verbosity = "medium";
gtp_log_level = "info";
- gtp_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf
index 8e786be5e9427af6de083dec009e3371f8e43e7a..0485957a8acc2f2f725c10859b8742ef6c9ff8a4 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf
@@ -96,17 +96,11 @@ RUs = (
log_config = {
global_log_level = "info";
- global_log_verbosity = "medium";
hw_log_level = "info";
- hw_log_verbosity = "medium";
phy_log_level = "info";
- phy_log_verbosity = "medium";
mac_log_level = "info";
- mac_log_verbosity = "high";
rlc_log_level = "info";
- rlc_log_verbosity = "medium";
flexran_agent_log_level = "info";
- flexran_agent_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
index 67044f38d91d5010d033bd00191d687eb8b578fc..cc8df8185a2680c470d67e26302db298e551a715 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
@@ -382,24 +382,6 @@ eNBs =
ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
-
- log_config :
- {
- global_log_level ="info";
- global_log_verbosity ="medium";
- hw_log_level ="info";
- hw_log_verbosity ="medium";
- phy_log_level ="info";
- phy_log_verbosity ="medium";
- mac_log_level ="info";
- mac_log_verbosity ="high";
- rlc_log_level ="info";
- rlc_log_verbosity ="medium";
- pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
- rrc_log_level ="info";
- rrc_log_verbosity ="medium";
- };
}
);
@@ -438,17 +420,10 @@ RUs = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf
index e044c186b9af31ed26a5f471dffc5faea596313f..4723fd3cba3a401d4c70f687e0e0685ffb9cab09 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf
@@ -176,19 +176,12 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf
index 5a547622abed393793b64034f17d4b2b699bc3f8..d811fb068e017d21ec742e63c56262d654d36045 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf
@@ -256,17 +256,10 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf
index 27826e5ce2cf42f3130cf6a917feccbdeda648e3..6669cef9a6944dee14083474f3a9591d44154c85 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf
@@ -176,19 +176,12 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf
index 5df0f107ea6a7e5b5f4c928ad61cd8427eb64076..1b4224da08d0d63c03722d0e7ed0f9edaf4899d9 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf
@@ -256,17 +256,10 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf
index cb50cccf2b9370147d165c449a6f3a4dbe35723d..ad95557bb970efd4e86ed3911b1d576931773746 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf
@@ -284,17 +284,10 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf
index 245e4ecf94a6568989aa620a45ab8b824833c3de..8c0f57c65dc2beb2cf76a234dbc5ee77772ff65e 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf
@@ -212,18 +212,11 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf
index 86b481f9d855f530ab56f821b65bb45cb2354a8e..506966d167da1797066e2f1845b939685925a49a 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf
@@ -256,17 +256,10 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf
index 1eb5da6a1810d315b2dea379976934a043514364..177cddec12bd3cb2375a17fb14d0c4ab5f34a889 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf
@@ -251,41 +251,15 @@ THREAD_STRUCT = (
worker_config = "WORKER_ENABLE";
}
);
-/*
- log_config :
- {
- global_log_level ="info";
- global_log_verbosity ="medium";
- hw_log_level ="info";
- hw_log_verbosity ="medium";
- phy_log_level ="info";
- phy_log_verbosity ="medium";
- mac_log_level ="info";
- mac_log_verbosity ="high";
- rlc_log_level ="info";
- rlc_log_verbosity ="medium";
- pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
- rrc_log_level ="info";
- rrc_log_verbosity ="medium";
- };
-*/
log_config :
{
global_log_level ="crit";
- global_log_verbosity ="crit";
hw_log_level ="crit";
- hw_log_verbosity ="crit";
phy_log_level ="crit";
- phy_log_verbosity ="crit";
mac_log_level ="crit";
- mac_log_verbosity ="crit";
rlc_log_level ="crit";
- rlc_log_verbosity ="crit";
pdcp_log_level ="crit";
- pdcp_log_verbosity ="crit";
rrc_log_level ="crit";
- rrc_log_verbosity ="crit";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf
index a929c439be5799e1e173165fc021cd1dfdda0158..aac2ec5f5e0932c0132ef806861bd8a7e7f1354e 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf
@@ -244,18 +244,11 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
index 43288ba3241e6a163c5d543d94bb74a29c4eb776..07cebbe75b1e7d579bcc540b6c58f6e05e04baa7 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
@@ -298,18 +298,11 @@ rfsimulator :
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf
index 92f2d4e6f145f01bea7e786c98dc503a81ef5ea7..222b203f71dc524331855d88f4b5e947083b3c0a 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf
@@ -211,18 +211,11 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf
index c3faa198ddac89ec1d406ee77d623124cc7a01fb..483aac6deb9a45c8e936c233054945009c4ed73a 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf
@@ -265,18 +265,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf
index 8fa8fcf99244344760c147d6730aaa8a85f2a813..9a91640a080d2b2ab14ed402759a35f0ba42fdd4 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf
@@ -251,18 +251,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf
index c2e364b75edba6e139f5e378abb0c64c169a81f9..05c81b5c512f4e6aa62e2f8ebaa237334cb931a8 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf
@@ -245,18 +245,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf
index 813a0e58e303b6f8fb33c22e8e8f91939a05dd9a..fbae1136b0b786c3abcdbff49ad683943e2a7a45 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf
@@ -265,18 +265,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf
index d81655e5d5a8db2aa74f2102d38b6b19118d8a9a..e5685d00a4af4575bebdd277d403e236465d174e 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf
@@ -257,18 +257,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf
index b063989fd257f3f98ba0f2f1ecfc2ae98d9ce897..b0126589cd81461716074401e5bd1494c24908c7 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf
@@ -257,18 +257,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf
index a171f2aae0ee2e014c6c066c1e58c2b9565222a5..683cdaeb2c40885393fc285eeddff5e5e34f1631 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf
@@ -258,18 +258,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf
index 856eed4fc2c877b87d08697b404467cc60c66a55..2d85f446d7b319c79f300f85c92dd27fdc6899f4 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf
@@ -262,17 +262,10 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf
index 012f46401ed53b11105aaa90fc33c54e6957224d..e1c9e9e167814760fc4dd204a2c17c8d0b8ae4db 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf
@@ -260,17 +260,10 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf
index 2e4dc540f3aa2b1503d37d28100dfda15e87c395..367ced1c8a936c55fd7b8e8c49910b284c118327 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf
@@ -303,17 +303,10 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf
index a454af7b21ffd9d02b3658cc4106522013c95c0e..e7d671e6a438f031d5acd08c4d546325039a8cd2 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf
@@ -254,18 +254,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
index af26091260466439ce424de8d5ec9d0075ece7fe..c9363da7f8e9658b03d2c39aa1108e95b17f7831 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
@@ -253,18 +253,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
index 928c70113f576a1f8682ac8edabcfc7d75b3bbd9..0e5ee33950fa5a5a269c9a1c3dfd71666e4cb4fc 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
@@ -253,18 +253,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
index 76bc5bf99231784ee30833efce4d765b381392df..019a0f0a363664d43f2059018e740e3ce05bbb5f 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
@@ -270,18 +270,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
index 7ff9d0ea770b8a63e9b8cc9fef2b5447fbf9344e..35e742900ad5d65cd4af11ceb0bc15c6ea3021fe 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
@@ -245,18 +245,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf
index 5c0434b57ef4f4f30cae38986e341dc3ccd49fb4..37cde2feb1d1217615ddae9bc591e48ce12d35ee 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf
@@ -255,18 +255,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf
index 4b1476a76d8f296421467286c4e5604999086062..f3922404010f4d0cbb13ce684c83cea580d8a863 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf
@@ -253,18 +253,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf
index 50169f4bce955887a224d7e0186c2d1a4c750c3e..59af2a9187fbc74c0ed21f68f72a69f330fa5a7d 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf
@@ -253,18 +253,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
index e217f39b94323ae3305dccde96694d5421862b3c..9358c3370f5fa522554f64e96d72c38a556f8311 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
@@ -246,18 +246,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
index b13962aee90335a968e72b594dc5b02b20edbaf6..a52841158cda36b418b2bbf26acba365b39c678a 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
@@ -1,18 +1,11 @@
log_config = {
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="debug";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="debug";
- rrc_log_verbosity ="full";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf
index 0b384958ae4b2b239d2a0a5884cd073ab660fe57..9a0f1cb036c0420cecfd5e515e8861ade4fccee4 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf
@@ -1,18 +1,11 @@
log_config = {
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="debug";
- mac_log_verbosity ="medium";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="debug";
- rrc_log_verbosity ="full";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf
index e05c64b4e83c4ed52e875f6b13a1ffdb98dc3039..4554a32a18ff232353a48ae5ba5647187dce1115 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf
@@ -217,17 +217,10 @@ THREAD_STRUCT = (
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf
index 1ef71bedc2880f9cdaa837102ba84e403e501fa6..c8bca91ccd2af438aed623b55311c104cae8d005 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf
@@ -200,19 +200,12 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="debug";
- mac_log_verbosity ="high";
rlc_log_level ="debug";
- rlc_log_verbosity ="high";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="high";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
index 9ce9f28cc254b3a82fcbc08ce29e7425ca46c8ba..1f72077ba3d73033d991595d4cd93b5e71369522 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
@@ -239,17 +239,10 @@ THREAD_STRUCT = (
log_config =
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf
index 30cb852a284010d87fad21b4cbc53bd43db7d1e3..401c42e503669cbdd0cec2c95e5552b0515b6761 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf
@@ -217,17 +217,10 @@ THREAD_STRUCT = (
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
index 519305b68d8f78b4e893905998a94f4542051cf7..22da6735a2cdd95df210ff896496cd8ae5dd4a1f 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
@@ -218,17 +218,10 @@ THREAD_STRUCT = (
log_config = {
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="debug";
- phy_log_verbosity ="medium";
mac_log_level ="debug";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf
index 1583e07ca1179d2b828acac83ea28f5d343108c2..004ad4db78ce18775dafe89b569f09c482143d01 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf
@@ -235,18 +235,11 @@ THREAD_STRUCT = (
log_config =
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf
index 9b611b3f07816e9107d316d335b77fbb406671a1..6a76028d25aa3b412d38b0e8918cdbe9b3d7167b 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf
@@ -168,19 +168,12 @@ eNBs =
log_config :
{
global_log_level ="debug";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
}
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.conf
index 3dc8e7dd32dcabc206737f718a4aa64b9efdc3d3..c14cc9589a26205608dbf14aa5c328ccd63b4100 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.conf
@@ -29,18 +29,11 @@ THREAD_STRUCT = (
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.tdd.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.tdd.conf
index 494086defdc827df902b90f7b5446bd38753f451..4f1a7fee309302a31433bc17e802f3b577a528c7 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.tdd.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.tdd.conf
@@ -29,18 +29,11 @@ THREAD_STRUCT = (
log_config = {
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf
index 1d8f61e442ba23af6a67ee6a21edbcea4c93fcc2..d2ef01392bc819b833c9c011c7753544a209bab8 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf
@@ -204,25 +204,6 @@ eNBs =
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.18.199/24";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
-
- log_config :
- {
- global_log_level ="info";
- global_log_verbosity ="high";
- hw_log_level ="info";
- hw_log_verbosity ="medium";
- phy_log_level ="info";
- phy_log_verbosity ="medium";
- mac_log_level ="info";
- mac_log_verbosity ="high";
- rlc_log_level ="debug";
- rlc_log_verbosity ="high";
- pdcp_log_level ="info";
- pdcp_log_verbosity ="high";
- rrc_log_level ="info";
- rrc_log_verbosity ="medium";
- };
-
}
);
@@ -269,17 +250,10 @@ RUs = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="high";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="high";
pdcp_log_level ="info";
- pdcp_log_verbosity ="high";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf
index 6df25273c83e506c8d286c3bacb8b8f7ad703896..d493f2990667def07d7dd1f3fc705cc6dbeabcbe 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf
@@ -205,25 +205,6 @@ eNBs =
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.18.199/24";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
-
- log_config :
- {
- global_log_level ="info";
- global_log_verbosity ="high";
- hw_log_level ="info";
- hw_log_verbosity ="medium";
- phy_log_level ="info";
- phy_log_verbosity ="medium";
- mac_log_level ="info";
- mac_log_verbosity ="high";
- rlc_log_level ="debug";
- rlc_log_verbosity ="high";
- pdcp_log_level ="info";
- pdcp_log_verbosity ="high";
- rrc_log_level ="info";
- rrc_log_verbosity ="medium";
- };
-
}
);
@@ -270,17 +251,10 @@ RUs = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="high";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="high";
pdcp_log_level ="info";
- pdcp_log_verbosity ="high";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
index 5591ed082dcecc81b959d44502fd5c5cab00acfa..4ec53064f11c2400c3c0ab53cd069c7cd717c08f 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
@@ -263,18 +263,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf
index dd8113e059020007251e9c152c2b2ee4cd2dc61d..7c0fa96adbb12b2ed16fcee3bcc23181e69d6165 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf
@@ -272,18 +272,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf
index 198ad8471ccbf29c2275dd1c688204caa21f0063..57aa459d49e7b00c33eafe565b1f52caa68af29e 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf
@@ -261,18 +261,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf
index 96335f23caf5f2a0ea673476487de6ac3bee4e1b..89dca2a75c4892f999aa0df87a81875e7199bc46 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf
@@ -258,18 +258,11 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
index 680a6cb4ae66fda61ffd70241fe9011909c6bc3b..43c2ab20ad6be972e36f7c906e46ee58f96fd6be 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
@@ -78,22 +78,13 @@ gNBs =
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="debug";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
ngap_log_level ="debug";
- ngap_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
index 215a57b95c5ab25322d3bc5808049db6b0af233d..0b6d7cd7c85bdab7411cb5c6ee93b64e4322ceab 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
@@ -254,22 +254,13 @@ THREAD_STRUCT = (
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="debug";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
ngap_log_level ="debug";
- ngap_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
index ab4713f8b5693914c0455e33b96b4b67492f76c2..b0e02ff2bc340a24667934a8a706cfc9c1f19144 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
@@ -265,20 +265,12 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
ngap_log_level ="info";
- ngap_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
index b77ad0b264297e0bcf95b63bbf6e4ed3dcdd9553..9bf20b54aba8c63e71dcb7ddae9aefee8d54ec63 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
@@ -54,7 +54,7 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
- # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+ # this is 2574.270 MHz + 53 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB = 518670;
dl_frequencyBand = 41;
# this is 3600 MHz
@@ -67,7 +67,7 @@ gNBs =
dl_carrierBandwidth = 106;
#initialDownlinkBWP
#genericParameters
- # this is RBstart=27,L=48 (275*(L-1))+RBstart
+ # this is RBstart=0,L=106 (275*(L-1))+RBstart
initialDLBWPlocationAndBandwidth = 28875; # 6366 12925 12956 28875 12952
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
@@ -282,22 +282,13 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
ngap_log_level ="debug";
- ngap_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
new file mode 100644
index 0000000000000000000000000000000000000000..cab801525b9ed5639ef7a36b424e8d646e05b5af
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
@@ -0,0 +1,291 @@
+Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+ ////////// Identification parameters:
+ gNB_ID = 0xe00;
+ gNB_name = "gNB-Eurecom-5GNRBox";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = 1;
+ plmn_list = ({
+ mcc = 208;
+ mnc = 99;
+ mnc_length = 2;
+ snssaiList = (
+ {
+ sst = 1;
+ sd = 0x1; // 0 false, else true
+ },
+ {
+ sst = 1;
+ sd = 0x112233; // 0 false, else true
+ }
+ );
+
+ });
+
+ nr_cellid = 12345678L;
+
+ ////////// Physical parameters:
+
+ ssb_SubcarrierOffset = 0;
+ pdsch_AntennaPorts = 1;
+ pusch_AntennaPorts = 1;
+ min_rxtxtime = 6;
+ sib1_tda = 0;
+
+ pdcch_ConfigSIB1 = (
+ {
+ controlResourceSetZero = 12;
+ searchSpaceZero = 0;
+ }
+ );
+
+ servingCellConfigCommon = (
+ {
+ #spCellConfigCommon
+
+ physCellId = 0;
+
+# downlinkConfigCommon
+ #frequencyInfoDL
+ # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+ absoluteFrequencySSB = 433096;
+ dl_frequencyBand = 66;
+ # this is 3600 MHz
+ dl_absoluteFrequencyPointA = 430000;
+ #scs-SpecificCarrierList
+ dl_offstToCarrier = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ dl_subcarrierSpacing = 1;
+ dl_carrierBandwidth = 106;
+ #initialDownlinkBWP
+ #genericParameters
+ # this is RBstart=27,L=48 (275*(L-1))+RBstart
+ initialDLBWPlocationAndBandwidth = 13475; # 6366 12925 12956 28875 12952
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ initialDLBWPsubcarrierSpacing = 1;
+ #pdcch-ConfigCommon
+ initialDLBWPcontrolResourceSetZero = 12;
+ initialDLBWPsearchSpaceZero = 0;
+
+ #uplinkConfigCommon
+ #frequencyInfoUL
+ ul_frequencyBand = 66;
+ ul_absoluteFrequencyPointA = 350000;
+ #scs-SpecificCarrierList
+ ul_offstToCarrier = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ ul_subcarrierSpacing = 1;
+ ul_carrierBandwidth = 106;
+ pMax = 20;
+ #initialUplinkBWP
+ #genericParameters
+ initialULBWPlocationAndBandwidth = 13475;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ initialULBWPsubcarrierSpacing = 1;
+ #rach-ConfigCommon
+ #rach-ConfigGeneric
+ prach_ConfigurationIndex = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+ prach_msg1_FDM = 0;
+ prach_msg1_FrequencyStart = 0;
+ zeroCorrelationZoneConfig = 13;
+ preambleReceivedTargetPower = -118;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+ preambleTransMax = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+ powerRampingStep = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+ ra_ResponseWindow = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+ ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+ ssb_perRACH_OccasionAndCB_PreamblesPerSSB = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+ ra_ContentionResolutionTimer = 7;
+ rsrp_ThresholdSSB = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+ prach_RootSequenceIndex_PR = 2;
+ prach_RootSequenceIndex = 1;
+ # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+ #
+ msg1_SubcarrierSpacing = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+ restrictedSetConfig = 0,
+
+ msg3_DeltaPreamble = 1;
+ p0_NominalWithGrant =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+ pucchGroupHopping = 0;
+ hoppingId = 40;
+ p0_nominal = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+ ssb_PositionsInBurst_PR = 2;
+ ssb_PositionsInBurst_Bitmap = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+ ssb_periodicityServingCell = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+ dmrs_TypeA_Position = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ subcarrierSpacing = 1;
+
+
+ #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ referenceSubcarrierSpacing = 1;
+ # pattern1
+ # dl_UL_TransmissionPeriodicity
+ # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+ dl_UL_TransmissionPeriodicity = 6;
+ nrofDownlinkSlots = 7;
+ nrofDownlinkSymbols = 6;
+ nrofUplinkSlots = 2;
+ nrofUplinkSymbols = 4;
+
+ ssPBCH_BlockPower = -25;
+ }
+
+ );
+
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// MME parameters:
+ amf_ip_address = ( { ipv4 = "192.168.70.132";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+
+ NETWORK_INTERFACES :
+ {
+ GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai";
+ GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24";
+ GNB_INTERFACE_NAME_FOR_NGU = "demo-oai";
+ GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24";
+ GNB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+
+ }
+);
+
+MACRLCs = (
+ {
+ num_cc = 1;
+ tr_s_preference = "local_L1";
+ tr_n_preference = "local_RRC";
+ ulsch_max_slots_inactivity = 100;
+ pusch_TargetSNRx10 = 200;
+ pucch_TargetSNRx10 = 200;
+ }
+);
+
+L1s = (
+ {
+ num_cc = 1;
+ tr_n_preference = "local_mac";
+ pusch_proc_threads = 8;
+ ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+ }
+);
+
+RUs = (
+ {
+ local_rf = "yes"
+ nb_tx = 1
+ nb_rx = 1
+ att_tx = 0
+ att_rx = 0;
+ bands = [7];
+ max_pdschReferenceSignalPower = -27;
+ max_rxgain = 75;
+ eNB_instances = [0];
+ #beamforming 1x4 matrix:
+ bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
+ clock_src = "internal";
+ }
+);
+
+THREAD_STRUCT = (
+ {
+ #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+ parallel_config = "PARALLEL_SINGLE_THREAD";
+ #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+ worker_config = "WORKER_ENABLE";
+ }
+);
+
+rfsimulator :
+{
+ serveraddr = "server";
+ serverport = "4043";
+ options = (); #("saviq"); or/and "chanmod"
+ modelname = "AWGN";
+ IQfile = "/tmp/rfsimulator.iqs";
+};
+
+security = {
+ # preferred ciphering algorithms
+ # the first one of the list that an UE supports in chosen
+ # valid values: nea0, nea1, nea2, nea3
+ ciphering_algorithms = ( "nea0" );
+
+ # preferred integrity algorithms
+ # the first one of the list that an UE supports in chosen
+ # valid values: nia0, nia1, nia2, nia3
+ integrity_algorithms = ( "nia2", "nia0" );
+
+ # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+ # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+ drb_ciphering = "yes";
+ drb_integrity = "no";
+};
+
+ log_config :
+ {
+ global_log_level ="info";
+ hw_log_level ="info";
+ phy_log_level ="info";
+ mac_log_level ="info";
+ rlc_log_level ="info";
+ pdcp_log_level ="info";
+ rrc_log_level ="info";
+ ngap_log_level ="debug";
+ };
+
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
index 27a1b6ad62c0258eeb0e5a9dd2a639db9dba3941..9452f00eed10a9e21117a6522df566b9811c47cb 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
@@ -282,21 +282,12 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
ngap_log_level ="debug";
- ngap_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
index e96c545a4e54838862762eb29d2534c6c0465607..09cf892b917b009d9dc2729a5744330f9f242868 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
@@ -37,7 +37,6 @@ gNBs =
pusch_AntennaPorts = 1;
min_rxtxtime = 6;
sib1_tda = 0;
- do_SRS = 1;
pdcch_ConfigSIB1 = (
{
@@ -282,22 +281,13 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
ngap_log_level ="debug";
- ngap_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf
index c8a0bace37b79f7bd99f1d2cacebfe5e265a6777..280461d2abf9be9d65343625afbbe7a5e601081e 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf
@@ -287,20 +287,12 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
ngap_log_level ="debug";
- ngap_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
index befceae6952fb739cbe4c47032f23ce8c92fbb37..fac54a298b7cf9901c6673efcb97cad30951af6b 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
@@ -310,21 +310,12 @@ security = {
log_config :
{
global_log_level ="info";
- global_log_verbosity ="medium";
hw_log_level ="info";
- hw_log_verbosity ="medium";
phy_log_level ="info";
- phy_log_verbosity ="medium";
mac_log_level ="info";
- mac_log_verbosity ="high";
rlc_log_level ="info";
- rlc_log_verbosity ="medium";
pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
rrc_log_level ="info";
- rrc_log_verbosity ="medium";
ngap_log_level ="debug";
- ngap_log_verbosity ="medium";
f1ap_log_level ="debug";
- f1ap_log_verbosity ="medium";
};
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf
new file mode 100644
index 0000000000000000000000000000000000000000..bd3076a014cc9d75098288ca4c0cca05cb8b0d29
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf
@@ -0,0 +1,301 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+ ////////// Identification parameters:
+ gNB_ID = 0xe00;
+ gNB_name = "gNB-OAI";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = 1;
+ plmn_list = ({
+ mcc = 208;
+ mnc = 99;
+ mnc_length = 2;
+ snssaiList = (
+ {
+ sst = 1;
+ sd = 0x1; // 0 false, else true
+ },
+ {
+ sst = 1;
+ sd = 0x112233; // 0 false, else true
+ }
+ );
+
+ });
+
+ nr_cellid = 12345678L;
+
+ ////////// Physical parameters:
+
+ ssb_SubcarrierOffset = 0;
+ pdsch_AntennaPorts = 1;
+ pusch_AntennaPorts = 1;
+ sib1_tda = 15;
+ min_rxtxtime = 6;
+
+ pdcch_ConfigSIB1 = (
+ {
+ controlResourceSetZero = 2;
+ searchSpaceZero = 0;
+ }
+ );
+
+ servingCellConfigCommon = (
+ {
+ #spCellConfigCommon
+
+ physCellId = 0;
+
+# downlinkConfigCommon
+ #frequencyInfoDL
+ # this is 3600 MHz + 12 PRBs@30kHz SCS (same as initial BWP)
+ absoluteFrequencySSB = 640288;
+ dl_frequencyBand = 78;
+ # this is 3600 MHz
+ dl_absoluteFrequencyPointA = 640000;
+ #scs-SpecificCarrierList
+ dl_offstToCarrier = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ dl_subcarrierSpacing = 1;
+ dl_carrierBandwidth = 24;
+ #initialDownlinkBWP
+ #genericParameters
+ # this is RBstart=27,L=48 (275*(L-1))+RBstart
+ initialDLBWPlocationAndBandwidth = 6325;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ initialDLBWPsubcarrierSpacing = 1;
+ #pdcch-ConfigCommon
+ initialDLBWPcontrolResourceSetZero = 2;
+ initialDLBWPsearchSpaceZero = 0;
+
+ #uplinkConfigCommon
+ #frequencyInfoUL
+ ul_frequencyBand = 78;
+ #scs-SpecificCarrierList
+ ul_offstToCarrier = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ ul_subcarrierSpacing = 1;
+ ul_carrierBandwidth = 24;
+ pMax = 20;
+ #initialUplinkBWP
+ #genericParameters
+ initialULBWPlocationAndBandwidth = 6325;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ initialULBWPsubcarrierSpacing = 1;
+ #rach-ConfigCommon
+ #rach-ConfigGeneric
+ prach_ConfigurationIndex = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+ prach_msg1_FDM = 0;
+ prach_msg1_FrequencyStart = 0;
+ zeroCorrelationZoneConfig = 13;
+ preambleReceivedTargetPower = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+ preambleTransMax = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+ powerRampingStep = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+ ra_ResponseWindow = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+ ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+ ssb_perRACH_OccasionAndCB_PreamblesPerSSB = 14;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+ ra_ContentionResolutionTimer = 7;
+ rsrp_ThresholdSSB = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+ prach_RootSequenceIndex_PR = 2;
+ prach_RootSequenceIndex = 1;
+ # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+ #
+ msg1_SubcarrierSpacing = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+ restrictedSetConfig = 0,
+
+ msg3_DeltaPreamble = 1;
+ p0_NominalWithGrant =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+ pucchGroupHopping = 0;
+ hoppingId = 40;
+ p0_nominal = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+ ssb_PositionsInBurst_PR = 2;
+ ssb_PositionsInBurst_Bitmap = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+ ssb_periodicityServingCell = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+ dmrs_TypeA_Position = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ subcarrierSpacing = 1;
+
+
+ #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ referenceSubcarrierSpacing = 1;
+ # pattern1
+ # dl_UL_TransmissionPeriodicity
+ # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+ dl_UL_TransmissionPeriodicity = 6;
+ nrofDownlinkSlots = 7;
+ nrofDownlinkSymbols = 6;
+ nrofUplinkSlots = 2;
+ nrofUplinkSymbols = 4;
+
+ ssPBCH_BlockPower = -25;
+ }
+
+ );
+
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// AMF parameters:
+ amf_ip_address = ( { ipv4 = "192.168.70.132";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+
+ NETWORK_INTERFACES :
+ {
+ GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai";
+ GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24";
+ GNB_INTERFACE_NAME_FOR_NGU = "demo-oai";
+ GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24";
+ GNB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+
+ }
+);
+
+MACRLCs = (
+{
+ num_cc = 1;
+ tr_s_preference = "local_L1";
+ tr_n_preference = "local_RRC";
+ pusch_TargetSNRx10 = 150;
+ pucch_TargetSNRx10 = 200;
+ ulsch_max_frame_inactivity = 1;
+}
+);
+
+L1s = (
+{
+ num_cc = 1;
+ tr_n_preference = "local_mac";
+ pusch_proc_threads = 8;
+ prach_dtx_threshold = 120;
+ pucch0_dtx_threshold = 150;
+ ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+}
+);
+
+RUs = (
+{
+ local_rf = "yes"
+ nb_tx = 1
+ nb_rx = 1
+ att_tx = 0
+ att_rx = 0;
+ bands = [78];
+ max_pdschReferenceSignalPower = -27;
+ max_rxgain = 114;
+ sf_extension = 0;
+ eNB_instances = [0];
+ #beamforming 1x4 matrix:
+ bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
+ clock_src = "internal";
+}
+);
+
+THREAD_STRUCT = (
+{
+ #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+ parallel_config = "PARALLEL_SINGLE_THREAD";
+ #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+ worker_config = "WORKER_ENABLE";
+}
+);
+
+rfsimulator :
+{
+ serveraddr = "server";
+ serverport = "4043";
+ options = (); #("saviq"); or/and "chanmod"
+ modelname = "AWGN";
+ IQfile = "/tmp/rfsimulator.iqs";
+};
+
+security = {
+ # preferred ciphering algorithms
+ # the first one of the list that an UE supports in chosen
+ # valid values: nea0, nea1, nea2, nea3
+ ciphering_algorithms = ( "nea0" );
+
+ # preferred integrity algorithms
+ # the first one of the list that an UE supports in chosen
+ # valid values: nia0, nia1, nia2, nia3
+ integrity_algorithms = ( "nia2", "nia0" );
+
+ # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+ # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+ drb_ciphering = "yes";
+ drb_integrity = "no";
+};
+
+log_config :
+{
+ global_log_level ="info";
+ global_log_verbosity ="medium";
+ hw_log_level ="info";
+ hw_log_verbosity ="medium";
+ phy_log_level ="info";
+ phy_log_verbosity ="medium";
+ mac_log_level ="info";
+ mac_log_verbosity ="high";
+ rlc_log_level ="info";
+ rlc_log_verbosity ="medium";
+ pdcp_log_level ="info";
+ pdcp_log_verbosity ="medium";
+ rrc_log_level ="info";
+ rrc_log_verbosity ="medium";
+ ngap_log_level ="debug";
+ ngap_log_verbosity ="medium";
+};
+
diff --git a/targets/RT/USER/TOOLS/thread_ipc.h b/targets/RT/USER/TOOLS/thread_ipc.h
deleted file mode 100644
index ec008c30df21efb6f633d30ed9359c25c000232e..0000000000000000000000000000000000000000
--- a/targets/RT/USER/TOOLS/thread_ipc.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-#ifndef __THREAD_IPC_H__
-#define __THREAD_IPC_H__
-
-
-#define SUB_FRAME_LENGTH 7680
-#define FRAME_LENGTH 76800
-
-#define UE_UL_DELAY 6 /*设置上行组帧在åŒæ¥æ—¶é’ŸåŸºç¡€ä¸Šçš„延时（å帧个数）*/
-#define UE_UL_SEND_DELAY 6 /*上行å‘é€å帧å·åœ¨æŽ¥æ”¶å帧时间戳上的延时（å帧个数）*/
-
-#define BUFFERMAX 5 /*环形缓冲区个数*/
-#define LOWBUFFER 3 /*环形缓冲区下é™, ä¸èƒ½ä¸º0*/
-#define HIGHBUFFER 4 /*环形缓冲区上é™*/
-
-typedef struct {
- long long subframe_num; /*å帧编å·*/
- int buffer[SUB_FRAME_LENGTH * 2]; /*一å帧数æ®*/
-} buffer_t;
-
-typedef struct {
- int packet_num; /*环形缓冲区数æ®åŒ…计数器，表示环形缓冲区有效数æ®åŒ…个数*/
- int isfull; /*æ ‡è®°çŽ¯å½¢ç¼“å†²åŒºæœ‰æ•ˆæ•°æ®åŒ…是å¦è¾¾åˆ°ä¸Šé™æ ‡å¿—*/
- int isempty; /*æ ‡è®°çŽ¯å½¢ç¼“å†²åŒºæœ‰æ•ˆæ•°æ®åŒ…是å¦è¾¾åˆ°ä¸‹é™æ ‡å¿—*/
-
- pthread_mutex_t buffer_mutex; /*环形缓冲区æ“作ä¿æŠ¤é”*/
- pthread_cond_t full_cond; /*环形缓冲区上é™æ¡ä»¶å˜é‡,é…åˆisfull使用 */
- pthread_cond_t empty_cond; /*环形缓冲区下é™æ¡ä»¶å˜é‡,é…åˆisempty使用*/
-
- buffer_t loop_buf[BUFFERMAX]; /*环形缓冲区*/
-} loop_buffer_op_t;
-
-typedef struct {
- int decoding_subframe_num; /*待解ç å帧的编å·*/
- pthread_mutex_t buffer_mutex; /*对sync_buffer临界区的ä¿æŠ¤é”*/
- int sync_buffer[SUB_FRAME_LENGTH * 10]; /*åŒæ¥çº¿ç¨‹ä¸Žä¸‹è¡Œè§£ç 线程数æ®å…±äº«ç¼“冲区*/
-} sync_buffer_t;
-
-typedef struct {
- unsigned int rx_timestamp; /*接收数æ®åŒ…第一个sample时间戳*/
- unsigned int tx_timestamp; /*å¾…å‘é€æ•°æ®åŒ…的时间戳*/
- unsigned long long current_subframe; /*当å‰å帧编å·*/
-
- int ue_sync_state; /*表示UE是å¦åœ¨åŒæ¥çŠ¶æ€ï¼Œ0表示失åŒæ¥ï¼Œ1表示åŒæ¥*/
- pthread_mutex_t sync_mutex; /*æ ¹æ®ue_sync_stateæ ‡å¿—ï¼Œå”¤é†’ç»„å¸§çº¿ç¨‹*/
-
- pthread_mutex_t ul_send_mutex; /*用于sync线程唤醒å‘é€çº¿ç¨‹å‘é€æ•°æ®*/
- pthread_mutex_t dl_decode_mutex;/*下行解ç ä¿æŠ¤é”，用于sync线程唤醒解ç 线程解ç */
-
- loop_buffer_op_t loop_buffer;
- sync_buffer_t sync_buffer;
-} g_thread_ipc_t;
-
-void loop_buffer_reset(buffer_t *loop_buf);
-int thread_ipc_init(void);
-int thread_ipc_deinit(void);
-int set_thread_attr(pthread_attr_t *attr, int policy, int priority, int cpuid);
-int find_subframe_num(unsigned long long current_subframe_num, buffer_t *buf, int *flag);
-int ue_unsync_thread_ipc_reset(void);
-
-extern g_thread_ipc_t thread_ipc;
-
-#endif
diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c
index 014e8854e2bbc90eed5e3e1e3f13e4546378e70e..16f26cc95cb2e3d34f34bbe18ac95eff9901cc0d 100644
--- a/targets/RT/USER/lte-ru.c
+++ b/targets/RT/USER/lte-ru.c
@@ -48,7 +48,6 @@
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
#include "assertions.h"
-#include "msc.h"
#include "PHY/defs_common.h"
#include "PHY/types.h"
#include "PHY/INIT/phy_init.h"
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 286d20ec09c3fb8a4eee1142aed861d836ff2ac0..62aff12744772bfefe5532bc4687146fedb763d8 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -34,13 +34,9 @@
#define _GNU_SOURCE /* See feature_test_macros(7) */
#include <sched.h>
-#include <common/utils/msc/msc.h>
-
-
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
#include "assertions.h"
-#include "msc.h"
#include "PHY/types.h"
@@ -498,8 +494,6 @@ static void init_pdcp(void) {
pdcp_set_rlc_data_req_func(rlc_data_req);
pdcp_set_pdcp_data_ind_func(pdcp_data_ind);
}
- } else {
- pdcp_set_pdcp_data_ind_func(proto_agent_send_pdcp_data_ind);
}
}
@@ -554,13 +548,7 @@ int main ( int argc, char **argv )
cpuf=get_cpu_freq_GHz();
printf("ITTI init, useMME: %i\n",EPC_MODE_ENABLED);
itti_init(TASK_MAX, tasks_info);
- // allows to forward in wireshark L2 protocol for decoding
- // initialize mscgen log after ITTI
- if (get_softmodem_params()->start_msc) {
- load_module_shlib("msc",NULL,0,&msc_interface);
- }
- MSC_INIT(MSC_E_UTRAN, ADDED_QUEUES_MAX+TASK_MAX);
init_opt();
// to make a graceful exit when ctrl-c is pressed
set_softmodem_sighandler();
diff --git a/targets/RT/USER/lte-softmodem.h b/targets/RT/USER/lte-softmodem.h
index cf35a13fe907d851156ded04b32c9847123a9163..0267ad8ce0ab32d0a15c9304a1025b5437dd74bb 100644
--- a/targets/RT/USER/lte-softmodem.h
+++ b/targets/RT/USER/lte-softmodem.h
@@ -23,14 +23,12 @@
#include "../../ARCH/COMMON/common_lib.h"
//#undef MALLOC
#include "assertions.h"
-#include "msc.h"
#include "PHY/types.h"
#include "PHY/defs_eNB.h"
#include "PHY/defs_UE.h"
#include "flexran_agent.h"
#include "s1ap_eNB.h"
#include "SIMULATION/ETH_TRANSPORT/proto.h"
-#include "proto_agent.h"
#include "executables/softmodem-common.h"
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c
index 4395694bf40823415794a57a8ca4d7d01fbc7b0c..2b39bd3f0fca94c7bef3f55d6f421b093b2a5254 100644
--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -37,7 +37,6 @@
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
#include "assertions.h"
-#include "msc.h"
#include "PHY/types.h"
@@ -596,12 +595,6 @@ int main( int argc, char **argv ) {
printf("ITTI init\n");
itti_init(TASK_MAX, tasks_info);
- // initialize mscgen log after ITTI
- if (get_softmodem_params()->start_msc) {
- load_module_shlib("msc",NULL,0,&msc_interface);
- }
-
- MSC_INIT(MSC_E_UTRAN, ADDED_QUEUES_MAX+TASK_MAX);
init_opt();
ue_id_g = (node_number == 0) ? 0 : node_number-2; //ue_id_g = 0, 1, ...,
if(node_number == 0)
diff --git a/targets/RT/USER/ru_control.c b/targets/RT/USER/ru_control.c
index 7280c785232af9346402aa07e37ca6861ed16a1e..083b5f91ef2e2b968a3af535db5defab49884594 100644
--- a/targets/RT/USER/ru_control.c
+++ b/targets/RT/USER/ru_control.c
@@ -46,7 +46,6 @@
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
#include "assertions.h"
-#include "msc.h"
#include "PHY/types.h"
diff --git a/targets/SCRIPTS/msc_gen.py b/targets/SCRIPTS/msc_gen.py
deleted file mode 100755
index ed5d337fc2dc009a4f48cb75ec2c421db1254006..0000000000000000000000000000000000000000
--- a/targets/SCRIPTS/msc_gen.py
+++ /dev/null
@@ -1,329 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# The aim of this script is to collect some traces from oai stack and generate a sequence diagram image (png or jpeg).
-#
-# It is supposed that a protocol name (MSC_NEW_STR) starts with...its name (RRC, MAC, NAS, S1AP, etc) then is followed by an underscore and whatever (RRC_UE, RRC_eNB)
-# Like this it is possible to distinguish between PDUS, SDUs or other messages only by reading source ans destination
-
-import sys
-import subprocess
-import re
-import socket
-import datetime
-from datetime import date
-import os, errno
-import argparse
-
-
-
-
-parser = argparse.ArgumentParser()
-parser.add_argument("--diag_rlc_um", "-u", type=str,help="Try to find RLC protocol diagnostics", default="no")
-parser.add_argument("--dir", "-d", type=str,help="Directory where msc logs can be found", default="/tmp")
-parser.add_argument("--profile", "-p", type=str,help="E_UTRAN, EPC", default="EPC")
-parser.add_argument("--no_message", "-M", type=str,help="Trace PDUs, not messages, SDUs", default="no")
-parser.add_argument("--no_pdu", "-P", type=str,help="Trace messages, SDUs, not PDUs", default="no")
-parser.add_argument("--no_event", "-E", type=str,help="Do not trace events", default="no")
-args = parser.parse_args()
-
-MSCGEN_OUTPUT_TYPE = "png"
-MAX_MESSAGES_PER_PAGE = 36
-
-MSC_NEW_STR = '[PROTO]'
-MSC_MSG_STR = '[MESSAGE]'
-MSC_BOX_STR = '[EVENT]'
-
-
-# This list is filled as follow : g_proto_names[module_id_int] = (proto_name), example RRC_UE
-g_proto_names = []
-# This list is filled as follow : g_proto_names[module_id_int] = (basename proto_name) example: RRC
-g_proto_types = []
-
-
-
-# list of messages
-g_messages = {}
-
-
-# Display color of messages of sending entities
-g_display_color = ['\"teal\"', # To check in msc.h: MSC_NAS_UE
- '\"red\"', # To check in msc.h: MSC_RRC_UE
- '\"red\"', # To check in msc.h: MSC_NAS_UE
- '\"red\"', # To check in msc.h: MSC_PDCP_UE
- '\"red\"', # To check in msc.h: MSC_RLC_UE
- '\"red\"', # To check in msc.h: MSC_MAC_UE
- '\"red\"', # To check in msc.h: MSC_PHY_UE
- '\"indigo\"', # To check in msc.h: MSC_PHY_ENB
- '\"indigo\"', # To check in msc.h: MSC_MAC_ENB
- '\"indigo\"', # To check in msc.h: MSC_RLC_ENB
- '\"indigo\"', # To check in msc.h: MSC_PDCP_ENB
- '\"orange\"', # To check in msc.h: MSC_RRC_ENB
- '\"black\"', # To check in msc.h: MSC_IP_ENB
- '\"black\"', # To check in msc.h: MSC_S1AP_ENB
- '\"black\"', # To check in msc.h: MSC_GTPU_ENB
- '\"black\"', # To check in msc.h: MSC_GTPU_SGW
- '\"black\"', # To check in msc.h: MSC_S1AP_MME
- '\"black\"', # To check in msc.h: MSC_MMEAPP_MME
- '\"black\"', # To check in msc.h: MSC_NAS_MME
- '\"black\"', # To check in msc.h: MSC_NAS_EMM_MME
- '\"black\"', # To check in msc.h: MSC_NAS_ESM_MME
- '\"black\"',
- '\"black\"',
- '\"black\"',
- '\"black\"',
- '\"black\"',
- '\"black\"',
- '\"black\"',
- '\"black\"',
- '\"black\"',
- '\"black\"',
- '\"black\"',
- '\"black\"']
-
-
-# helper for diagnostic of RLC
-g_diag_rlc_sn = {}
-
-g_sequence_generator = 0
-
-
-g_filenames = []
-if "E_UTRAN" == args.profile.strip():
- g_filenames = [
- args.dir+'/openair.msc.0.log',
- args.dir+'/openair.msc.1.log']
-elif "EPC" == args.profile.strip():
- g_filenames = [
- args.dir+'/openair.msc.2.log',
- args.dir+'/openair.msc.3.log',
- args.dir+'/openair.msc.4.log']
-
-def sequence_number_generator():
- global g_sequence_generator
- l_seq = g_sequence_generator
- g_sequence_generator = g_sequence_generator + 1
- return l_seq
-
-def file_is_empty(fpath):
- return False if os.path.isfile(fpath) and os.path.getsize(fpath) > 0 else True
-
-def parse_oai_log_files():
- global g_entities_dic
- global g_entities
- global g_messages
- global g_final_display_order_list
- #open TXT file that contain OAI filtered traces for mscgen
-
- # we may insert diagnostic events
- event_id_offset = 0
- for filename in g_filenames:
- if file_is_empty(filename):
- continue
- try:
- fhandle = open(filename, 'r')
- fcontent = fhandle.read()
- fhandle.close()
-
- # split file content in lines
- lines = fcontent.splitlines()
- for line in lines:
- print ("INPUT LINE: %s " % line)
- if line.strip() != "" and not line.strip().startswith('#'):
- partition = line.split(' ',3)
- event_id = int(partition[0]) + event_id_offset
- event_type = partition[1]
- entity_id = int(partition[2])
- if MSC_NEW_STR == event_type:
- entity_name = partition[3]
- if len(g_proto_names) <= entity_id:
- for i in range(len(g_proto_names),(entity_id +1)):
- g_proto_names.append("NotDeclared")
- g_proto_types.append("NotDeclared")
- g_proto_names[entity_id] = entity_name
- partition_name1 = entity_name.split('_',1);
- partition_name2 = partition_name1[0].split('-',1);
- partition_name3 = partition_name2[0].split();
- g_proto_types[entity_id] = partition_name3
- print ("entity name %s , entity type %s" % (g_proto_names[entity_id],g_proto_types[entity_id]) )
- # if line is a trace of a message between 2 protocol entities or layers
- elif MSC_MSG_STR == event_type:
- #print ("partition[3]:%s" % partition[3])
- sub_partition = partition[3].split(' ',4)
- arrow = sub_partition[0]
- entity2_id = int(sub_partition[1])
- mac = int(sub_partition[2])
- time = sub_partition[3]
- message = sub_partition[4]
- Message = {}
- Message['mac'] = mac
- Message['time'] = time
- Message['message'] = message
- Message['line_color'] = g_display_color[entity_id]
- Message['text_color'] = g_display_color[entity_id]
- if arrow == '<-':
- if "yes" == args.diag_rlc_um.strip() and "DATA SN " in message and "RB UM " in message:
- rlc_key = re.match(r"[^[]*\[([^]]*)\]", message).groups()[0]
- sn_info = message.partition("SN")[2]
- if sn_info.strip() != "":
- sn_str = sn_info.strip().partition(" ")[0]
- sn = int(sn_str)
- if rlc_key in g_diag_rlc_sn:
- previous_sn = g_diag_rlc_sn[rlc_key]
- if (previous_sn + 1) % 1024 != sn:
- print ("DIAG missing SN: %s " % line)
- MessageDiag = {}
- MessageDiag['type'] = "box"
- MessageDiag['tx'] = entity_id
- MessageDiag['rx'] = entity_id
- MessageDiag['discarded'] = False
- MessageDiag['time'] = time
- MessageDiag['message'] = "Missing SN "+ sn_str + " detected"
- MessageDiag['line_color'] = '\"red\"'
- MessageDiag['text_color'] = '\"red\"'
- g_messages[event_id + event_id_offset] = MessageDiag
- event_id_offset = event_id_offset + 1
- g_diag_rlc_sn[rlc_key] = int(sn)
- Message['type'] = "rx"
- Message['tx'] = entity2_id
- Message['rx'] = entity_id
- Message['discarded'] = False
- g_messages[event_id + event_id_offset] = Message
-
- elif arrow == '->':
- Message['type'] = "tx"
- Message['tx'] = entity_id
- Message['rx'] = entity2_id
- Message['discarded'] = False
- g_messages[event_id + event_id_offset] = Message
- elif arrow == 'x-':
- Message['type'] = "rx"
- Message['tx'] = entity2_id
- Message['rx'] = entity_id
- Message['discarded'] = True
- g_messages[event_id + event_id_offset] = Message
- elif arrow == '-x':
- Message['type'] = "tx"
- Message['tx'] = entity_id
- Message['rx'] = entity2_id
- Message['discarded'] = True
- g_messages[event_id + event_id_offset] = Message
-
- elif MSC_BOX_STR == event_type:
- sub_partition = partition[3].split(' ',1)
- time = sub_partition[0]
- message = sub_partition[1]
- Message = {}
- Message['type'] = "box"
- Message['tx'] = entity_id
- Message['rx'] = entity_id
- Message['discarded'] = False
- Message['time'] = time
- Message['message'] = message
- Message['line_color'] = g_display_color[entity_id]
- Message['text_color'] = g_display_color[entity_id]
- g_messages[event_id + event_id_offset] = Message
-
- except IOError, e:
- print ("File %s INPUT LINE: %s " % (filename, line))
- print 'err message'
-
- #print("------------------------------------")
- #print (" %s " % ( g_messages ) )
-
-# for event_id_int in sorted(g_messages.iterkeys()):
-
-
-
-def msc_chart_write_header(fileP):
- global g_final_display_order_list
- fileP.write("msc {\n")
- fileP.write("width = \"2048\";\n")
-
- entity_line_list_str = ''
- #print (" %s " % ( g_proto_names ) )
- for entity in g_proto_names:
- if entity != 'NotDeclared':
- entity_line_list_str = entity_line_list_str + ' ' + entity + ','
-
- entity_line_list_str = entity_line_list_str.rstrip().strip(',')
- fileP.write(" %s;\n" % (entity_line_list_str))
-
-
-def msc_chart_write_footer(fileP):
- fileP.write("\n}\n")
-
-def msc_chart_generate(file_nameP):
- global MSCGEN_OUTPUT_TYPE
- print "Generating sequence diagram for ",file_nameP
- command_line = "mscgen -T " + MSCGEN_OUTPUT_TYPE + " -i " + file_nameP
- fi,fo,fe=os.popen3(command_line)
- for i in fe.readlines():
- print "error:",i
-
-def get_new_file_descriptor():
- global g_base_file_name
- global g_page_index
- l_file_name = g_base_file_name + str(g_page_index)+'.txt'
- l_file = open(l_file_name, "wb")
- print "Generating mscgen input file ",l_file_name;
- return l_file
-
-
-###### MAIN STAR HERE #################
-parse_oai_log_files()
-
-g_page_index = 0
-g_message_index = 0
-g_now = datetime.datetime.now()
-g_now_formated = 'mscgen_' + args.profile.strip() + '_'+ g_now.strftime("%Y-%m-%d_%H.%M.%S")
-#g_currentdir = os.curdir
-g_resultdir = os.path.join(args.dir, g_now_formated)
-os.mkdir(g_resultdir)
-os.chdir(g_resultdir)
-
-g_base_file_name = args.profile.strip() + '_mscgen_page_'
-
-g_file = get_new_file_descriptor()
-msc_chart_write_header(g_file)
-
-for event_id_int in sorted(g_messages.iterkeys()):
- message = g_messages[event_id_int]
- if 'tx' in message['type']:
- if "yes" == args.no_message.strip():
- if g_proto_types[message['tx']] != g_proto_types[message['rx']]:
- continue
- if "yes" == args.no_pdu.strip():
- if g_proto_types[message['tx']] == g_proto_types[message['rx']]:
- continue
- g_file.write(" %s=>%s [ label = \"(%d|%s) %s\", linecolour=%s , textcolour=%s ] ;\n" % (g_proto_names[message['tx']], g_proto_names[message['rx']], event_id_int, message['time'], message['message'], message['line_color'], message['text_color']))
-
- elif 'rx' in message['type']:
- if "yes" == args.no_message.strip():
- if g_proto_types[message['tx']] != g_proto_types[message['rx']]:
- continue
- if "yes" == args.no_pdu.strip():
- if g_proto_types[message['tx']] == g_proto_types[message['rx']]:
- continue
- g_file.write(" %s<=%s [ label = \"(%d|%s) %s\", linecolour=%s , textcolour=%s ] ;\n" % (g_proto_names[message['rx']], g_proto_names[message['tx']], event_id_int, message['time'], message['message'], message['line_color'], message['text_color']))
-
- elif 'box' in message['type']:
- if "yes" == args.no_event.strip():
- continue
- g_file.write(" %s note %s [ label = \"%s\", textcolour=%s ] ;\n" % (g_proto_names[message['tx']], g_proto_names[message['rx']], message['message'], message['text_color']))
-
- g_message_index = g_message_index + 1
-
- if ((g_message_index % MAX_MESSAGES_PER_PAGE) == 0):
- msc_chart_write_footer(g_file)
- g_file.close()
- msc_chart_generate(g_file.name)
- g_page_index = g_page_index + 1
-
- g_file = get_new_file_descriptor()
- msc_chart_write_header(g_file)
-
-
-msc_chart_write_footer(g_file)
-g_file.close()
-msc_chart_generate(g_file.name)