Merge branch 'episys/temp_merge_req' into 'episys/master'

Select fair RR packet scheduler

See merge request aburger/openairinterface5g!16

ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf

@@ -212,6 +212,7 @@ MACRLCs = (
 	remote_s_portd   = 50010;
 	tr_s_preference = "nfapi";
 	tr_n_preference = "local_RRC";
+	scheduler_mode = "fairRR";
         }  
 );
 

openair3/NAS/TOOLS/display.c

@@ -262,10 +262,12 @@ void display_usim_data(const char *filename) {
 	kasme[USIM_K_ASME_SIZE] = '\0';
 	memcpy(kasme, data.securityctx.Kasme.value, USIM_K_ASME_SIZE);
 	printf("\tKasme\t: \"%s\"\n", kasme);
+	#if 0
 	printf("\tulNAScount\t: 0x%.8x\n",
 			*(uint32_t*) data.securityctx.ulNAScount.value);
 	printf("\tdlNAScount\t: 0x%.8x\n",
 			*(uint32_t*) data.securityctx.dlNAScount.value);
+	#endif
 	printf("\talgorithmID\t: 0x%.2x\n\n",
 			data.securityctx.algorithmID.value[0]);
 

openair3/NAS/UE/API/USIM/usim_api.c

@@ -249,7 +249,9 @@ int usim_api_authenticate_test(usim_data_t *usim_data,
     LOG_TRACE(INFO,
               "USIM-API  - Comparing the XMAC with the MAC included in AUTN Succeeded");
     /* Verify that the received sequence number SQN is in the correct range */
-    rc = _usim_api_check_sqn(*(uint32_t*)(sqn), sqn[USIM_API_SQN_SIZE - 1]);
+    uint32_t v;
+    memcpy(&v, sqn, sizeof(v));
+    rc = _usim_api_check_sqn(v, sqn[USIM_API_SQN_SIZE - 1]);
   }
 
 
@@ -392,7 +394,9 @@ int usim_api_authenticate(usim_data_t *usim_data, const OctetString* rand_pP, co
     LOG_TRACE(INFO,
               "USIM-API  - Comparing the XMAC with the MAC included in AUTN Succeeded");
     /* Verify that the received sequence number SQN is in the correct range */
-    rc = _usim_api_check_sqn(*(uint32_t*)(sqn), sqn[USIM_API_SQN_SIZE - 1]);
+    uint32_t v;
+    memcpy(&v, sqn, sizeof(v));
+    rc = _usim_api_check_sqn(v, sqn[USIM_API_SQN_SIZE - 1]);
   }