Commit Graph
1762 Commits
Author SHA1 Message Date
Melissa Elkadi 09fb68de74 Cleaned up trigger function for meas reports
Also removed several warnings by properly
declaring nr-nFAPI functions and removed
declaration of unused functions. Also, reverted
eNB configuration file changes.
2021-05-18 10:25:04 -07:00
Michael Cook 9ac06d4b3a Fix warning about log message argument type 2021-05-16 05:44:25 -07:00
Melissa Elkadi dc2865f3ba Added logs and updated eNB conf file for EPC if necessary 2021-05-13 15:13:59 -07:00
Melissa Elkadi bfa5d486e3 Added comments to show MRDC and free() hacks 2021-05-13 13:45:47 -07:00
Melissa Elkadi bc5677f4c4 Triggering works, not using OAI mechanism
gNB is crashing when setting up the tunnel interface
between the NR UE and itself.
2021-05-13 09:30:30 -07:00
Melissa Elkadi 63ca5f692d Hack to not free measObjs
Also, 12 Frame triggering of MeasurementReport
is still in development and not working.
2021-05-12 16:10:14 -07:00
Melissa Elkadi e455ae22c8 Added MRDC capabilites in a hacky way 2021-05-11 17:03:35 -07:00
Melissa Elkadi 31e51f3663 Processing NR_UE_Capability_info and sending 2021-05-11 15:40:43 -07:00
Melissa Elkadi a7cbe98fa7 mbms_create_tasks was calling SCTP task again.
This caused the SCTP descriptor to be reset. This
made issues in the X2 interface between gNB and eNB.
Lots of logs added here. Need to fill NR_UE_Capability_Info
properly.
2021-05-10 17:01:12 -07:00
Melissa Elkadi 9009124223 Handling UE_capability_enquiry at NR UE
Now, we are able to fill the UE_Capability_Info that
the LTE UE and eNB are expecting. We then are able to
generate a RRC_DCCH_DATA_COPY_IND to trigger the
processing of the UE_Capability_Info (and sending the
info to the eNB). The info being received at eNB has not
been tested yet.
Also some code clean up.
2021-05-10 11:06:45 -07:00
Melissa Elkadi 5f2d246a8c Added comments and cleaned up the code.
The encode is still  working but now we need to
add in some new functionality to handle NR Capabilites.
2021-05-08 14:52:08 -07:00
Melissa Elkadi 56f2203b1d WIP: Encoding is succeeding. Hacked phy_id. 2021-05-08 09:30:55 -07:00
Melissa Elkadi 997c2e07ad Added rsrp/q back into report. ASN debug on. 2021-05-07 15:19:55 -07:00
Melissa Elkadi 1f3b397043 do_nrMeasReport updated for elements eNB expects
Also updated the generate_nrMeasReport().
The uper_encode_to_buffer is still not working.
2021-05-06 16:54:01 -07:00
Melissa Elkadi c4d7e11c1c Working on do_nrMeasurementReport 2021-05-05 16:42:22 -07:00
Melissa Elkadi cee317b73f Removed reportConfig dump funciton
Also removed the [eNB_index + 1] saving/writing
in the process_MeasObj function. This indexing
was incorrect. Also cleaned up the code, fixed
ssRSRB -> ssbRSRP. Lastly, added assertFatals
around indexing in process_measObj function.
2021-05-05 10:07:37 -07:00
Melissa Elkadi 842774254b ReportConfig was being indexed out of bounds
Added check and logs. If we change ind = 1 it
crashes the LTE UE so we log for now. Also cleaned
up a lot of the code. Lastly, we set freed vars to NULL.
2021-05-04 16:20:37 -07:00
Melissa Elkadi 7e339b4610 Currently receiving measurement data from NR UE
This commit has several other changes. The changes
include the following:
1. Changed the port numbers for the NRUE<->Proxy
2. Fixed the send to function in the NR UE
   (Previously only sending buffer not buffer+msg_type)
3. Updated pack/unpack of the SSB PDU (new RSRB field added)
4. Fixed several NR logs
5. Opening socket with NRUE<->Proxy AFTER receving RRC
   measurement request from the LTE UE
2021-05-03 15:31:32 -07:00
Melissa Elkadi 34eeae0874 NR SA thread and sockets have been added.
This commit also removed MAX_NUM_NEIGH_CELLs and
replaced it with MAX_GNB_CELLS. This was a minor change
OAI added. The standalone sockets for the NR UE correctly
connect to the proxy. We are currently receiving dl_tti
messages from the proxy.
2021-05-01 15:05:04 -07:00
Melissa Elkadi 6cace48013 Added in init function in RRC_NSA_NRUE task creation 2021-05-01 12:47:16 -07:00
Melissa Elkadi 539b1b564a Removed commented code in nr-softmodem.c
Also enabled X2 when we are not using the EPC
Added in the case statement for handling the
dl_dcch_msg from the NR UE. Also added in the
proper decoding of that dl_dcch_msg and freeing
2021-05-01 11:48:21 -07:00
Melissa Elkadi e50ca02957 Chaging NR functions to be properly named
This commit removed all the linking errors
between the NR UE and the LTE UE. This was done by
changing:
-      rrc_data_req_ue
+      rrc_data_req_nr_ue
2021-05-01 11:32:26 -07:00
Melissa Elkadi e1a77b2d82 Add NSA mode to working dl_tti messages from gNB
This commit is not currently building, but I wanted
to be able to save the changes that I have added.
2021-04-30 13:36:18 -07:00
Michael Cook 092caec8ca Merge branch 'episys-merge' into episys/trial-merge-to-master 2021-03-14 10:58:46 -04:00
Michael Cook b6766ee8ae decode_SIB1: Was reading past the end of plmn_data
Found by -fsanitize=address
2021-02-27 09:29:09 -08:00
Melissa Elkadi 98c8ddb673 Merge remote-tracking branch 'origin/develop' into episys-merge
Removing references to memcpy_dl_config_req and
memcpy_tx_req because these functions are leaking
memory. For our standalone mode we have created
new/modified memcpy_dl/tx_req functions.
2021-02-24 11:49:17 -08:00
hardy accae67113 Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08 2021-02-23 09:31:05 +01:00
Melissa Elkadi df2d3459d8 Set first random value to be UE number
Also added logs for debugging this rare random value issue.
2021-02-19 15:00:36 -08:00
Melissa Elkadi 17ede97029 Changed UE Capabilities log to a LOG_A 2021-02-15 15:27:25 -08:00
Cedric Roux 73f3a458cf NSA: finalize nea2 security for gNB
- a new section in the configuration file to select security algorithms,
  with new code to deal with it
- cleanup CG-ConfigInfo: specs seem to indicate that we must not
  add mcg_RB_Config; the gNB has to deal with that
- as a consequence, modify fill_default_rbconfig() that is called in
  every cases and needs security and bearer parameters

The new section in the configuration file looks like:

    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", "nea2" );

      # preferred integrity algorithms
      # the first one of the list that an UE supports in chosen
      # valid values: nia0, nia1, nia2, nia3
      integrity_algorithms = ( "nia0" );
    };
2021-02-15 15:25:52 +01:00
Cedric Roux cb589c211c minor trivial bugfix 2021-02-15 15:25:52 +01:00
Cedric Roux 10e021e96d NSA: first draft of nea2 security for gNB
The code is forced to use nea2, no matter what the UE supports.

After 2^18 PDCP packets, it will fail to work (we don't use HFN yet).

These limitations will be fixed in later commits.

The existing security function was not reused, because it does too
much memory allocation and initializes the security context at each
ciphering. So here comes nr_pdcp_security_nea2_cipher(). And also
the ciphering is done inplace. To be changed if necessary.
2021-02-15 15:25:47 +01:00
Raymond Knopp a446eb0ebc Merge branch 'episys/master' into episys-merge
Conflicts:
	common/utils/LOG/log.h
	common/utils/ocp_itti/intertask_interface.cpp
	nfapi/oai_integration/nfapi_vnf.c
	nfapi/open-nFAPI/nfapi/src/nfapi.c
	openair2/LAYER2/MAC/main_ue.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/PHY_INTERFACE/phy_stub_UE.c
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	openair3/NAS/UE/ESM/esm_ebr_context.c
	targets/COMMON/openairinterface5g_limits.h
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
2021-02-13 22:52:33 +01:00
Cedric Roux 0b4335accc NSA: some work on security (for PDCP)
- compute correct kgNB
- propagate properly NR security capabilities of an UE
  (involves: rrc, s1ap, x2ap)
2021-02-12 16:01:37 +01:00
Mahesh f69af6abaf merge MR978 (5G nFAPI) into develop 2021-02-12 16:26:22 +05:30
Mahesh eb19e02cf3 Merging MR978 with develop 2021-02-11 22:50:25 +05:30
Melissa 9fa09f530f Updated non-blocking PDCP socket
More accurately, we changed the do/while infinite
loop to be an infinite for loop for the read command of
the socket. The socket file descriptor choice is more clear now.
2021-02-09 14:09:39 -08:00
Mahesh 0e6f1e6ad6 Merge conflicts resolved 2021-02-08 18:05:29 +05:30
Robert Schmidt d7f46a2ff2 Set RRC nrofHARQ_ProcessesForPDSCH to 16 2021-02-07 10:39:39 +01:00
hardy 663dd1251c Merge remote-tracking branch 'origin/NR_RA_cleanup' into integration_2021_wk05 2021-02-05 12:00:38 +01:00
hardy 5d832308c6 Merge remote-tracking branch 'origin/NR_SA_itti_sim_wk48' into integration_2021_wk05 2021-02-05 11:43:54 +01:00
Xue Song 6a3b7b40a5 Merge branch 'master' into develop_SA_L3
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
2021-02-03 14:58:07 +09:00
hardy c00b44028b Merge remote-tracking branch 'origin/develop-sib1-update' into integration_2021_wk05 2021-02-02 15:40:22 +01:00
Mahesh ae422aca1f Merge conficts resolved 2021-02-02 09:36:49 +05:30
yoshio.inoue c49220610d add TODO comments 2021-02-01 21:19:04 +09:00
Cedric Roux 94dad700c4 lte/nr x2ap: fix content of SgNBAdditionRequest
Wireshark (version 3.3.2) was not happy.
https://asn1.io/asn1playground/ was not happy.

Let's make them happy.

So then everyone is happy.
2021-02-01 11:48:44 +01:00
Wu.Jing 37f0198944 Revert "remove the commented code from rrc_gNB.c"
This reverts commit 15caed4d54.
2021-02-01 16:02:47 +09:00
Wu.Jing c20fae1dea Merge branch 'develop_SA_SIM' into develop_SA_L3 2021-02-01 14:58:51 +09:00
He Shanyun 150221536c change output format for ran ue ngap id 2021-02-01 14:08:19 +09:00
Xue Song a85f261b54 add license text
fix some problems
2021-02-01 13:59:56 +09:00