Commit Graph
15905 Commits
Author SHA1 Message Date
Melissa 56d2985c21 Merge branch 'episys/david/multiUE_with_crnti_checking' into 'episys/mel_and_david_ip'
Added crnti checking in nrUE and update in gNB

See merge request aburger/openairinterface5g!53
2021-08-09 23:46:31 +00:00
Deokseong "David" Kim 4133b6bb60 Added crnti checking in nrUE and update in gNB 2021-08-09 23:46:31 +00:00
Melissa Elkadi 4e6e7519af Semicolon in RRC NR UE incorrect 2021-08-09 15:54:59 -07:00
Melissa Elkadi 4f1d543478 Adding hexdumps to see dc/p bit in PDU
At this point we can see the UDP uplink data
getting to the GTP layer of the gNB. This
only works if you change the memcpy in serialize_sdu()
to not have the encoded.byte
2021-08-09 14:59:27 -07:00
Melissa Elkadi 745241bd63 Merge branch 'episys/nsa_epc_gnb_updates' into episys/david/multiUE_with_crnti_checking
Also, lots of debugging logs added
2021-08-04 16:24:27 -07:00
David Kim c619833442 Added crnti checking routine in nrUE. 2021-08-04 10:08:22 -07:00
Melissa Elkadi d95e35df3c Reverted AssertFatal and just return instead
In the PDCP layer, if the sdu size < 3, this
just means control information is being passed.
In this case, we do not want to cipher the sdu,
its better to just return.
]
2021-08-03 17:04:35 -07:00
Melissa Elkadi 7d505e70f2 Updated PDSCH pdu copy from tx_data_req
Also, finally committing the critical logs for IP traffic.
2021-08-03 16:38:07 -07:00
Melissa Elkadi 952e2cd131 Adding #include assertions.h for PDCP file 2021-08-03 13:29:32 -07:00
Melissa Elkadi 5751a0a435 Not sending random data to gNB, sending IP
The IP traffic still does not work. But we are
updating the NR UE scheduler to ensure we are are
sending true IP traffic. Also, we were getting an
assert(); as well, and there was no logs, so we
fix that in this commit as well.
2021-08-03 13:25:45 -07:00
David Kim 54465993d5 queueing sfn slot information contained in channel params. 2021-07-30 16:44:39 -07:00
Melissa Elkadi 702a060e65 Added check for EPC mode to init RLC layer 2021-07-30 14:52:40 -07:00
David Kim dd73b2df87 Updated AssertFatal conditions and LOG level from I to D
Regarding dl_hard, some AssertFatal commented out.
Regarding to memory allocation error, AssertFatal was used.
2021-07-30 08:35:57 -07:00
Melissa Elkadi b5e8954476 Changed logic in MAC layer to allow RLC data read
Also changed logic in the NR UE schedule to read
IP traffic. Also, configured the RLC layer in the
NR UE softmodem and the DRBs with the cRNTI once
the RACH procedure is complete in the NR UE.
2021-07-29 15:55:59 -07:00
David Kim 61aa4f99dd Code cleaning in formatting and fixing typo. 2021-07-29 13:32:21 -07:00
David Kim c80193731d Commented some AssertFatal condition in dlsch ack/nack scheduling. 2021-07-29 10:38:56 -07:00
Melissa Elkadi 97a648e35f IP Traffic not working, tun if established by NRUE
Updated the configuration files. Added a sleep to
ensure that the LTE UE gets attached to the EPC
before the bearer is modified to be gNB. Updated
the ifconfig tunnel up command to be brought up
by the NR UE socket when in NSA mode. Lastly,
started the gNB PDCP layer in S1 mode.
2021-07-28 15:36:11 -07:00
David Kim 829bf4f8a2 Restored to the original OAI ue and nr-ue config file
Restored original LOG level.
Code cleanup to remove emptry space and added some logs.
2021-07-28 00:24:35 -07:00
David Kim 38e5415f34 Fixing "Unexpected ULSCH HARQ PID" issue.
1. If VNF is slower than PNF, next scheduling will be done after resync.
2. If VNF is unstable in slot progress, next scheduling will be done in next stable status.
3. SFN/SLOT indications are queued in nrUE.
4. get_queue is used instead of unquque for FIFO operation.
2021-07-27 21:02:01 -07:00
Melissa Elkadi 24245d8805 Log argument indexed passed the end of array.
Unnecessary dl_ind_type array for logging.
2021-07-20 15:21:23 -07:00
David Kim 4f23fa2f61 added queues between VNF and MAC to handle indications. 2021-07-19 18:55:02 -07:00
Melissa 7df8064bb7 Merge branch 'proxy-nfapi-conf' into 'episys/x2_trigger_nsa'
Separate nfapi.conf files for proxy

See merge request aburger/openairinterface5g!47
2021-07-19 21:30:42 +00:00
Michael Cook 102ff853ec Separate nfapi.conf files for proxy
In scripts/conf_files, restore ue.nfapi.conf and nr-ue.nfapi.conf
to the template versions.  And add proxy_ue.nfapi.conf
proxy_nr-ue.nfapi.conf for use with emane.git's run-oai and
multi-ue-proxy.git's run-oai.
2021-07-17 07:52:49 -07:00
Melissa Elkadi 7f2e622b0e Sending tunnel interface 'up' command to NR UE
Once the LTE UE's tunnel interface with the EPC
is ready to be established, if we are in NSA mode,
we do not want to launch the tunnel interface
from the LTE UE side, but in the NR UE. Via itti_msgs
we send the string containing the tunnel interface
'up' command to the NR UE and bring it up from the NR UE.
2021-07-07 11:55:34 -07:00
Melissa Elkadi 9d644f247c Fixed memory leak for unqueuing uci_inds 2021-07-05 10:15:26 -07:00
Melissa Elkadi 6ddb49d09c Sending uci_ind based on rx'd ul_tti's sfn/slot
Also, updated the filing of the DCI payload
based on the actual number of recevied bits
and not based on the max number of rx'd bits.
2021-07-02 13:51:39 -07:00
Melissa Elkadi 4dfe7c2596 5G Userplane working 50% of the time
This commit includes several changes.
First, it updates the way we fill the uplink
UCI indication. This still has some todo comments
since all the fields in this ind were hardcoded.
It also updates the pack and unpack functions for
the NR_UCI incations. Lastly, it includes updates
to the gNB UCI scheduler. The updates in the gNB
were cherry picked from develop. There are two updates
to the VNF which allow the VNF timing/slots to be
adjusted based on the received timing_info packets
from the VNF. This adjustment was disabled in IISc's
nFAPI code. For now, it is improving the timing
between the VNF and PNF.
2021-07-01 12:21:57 -07:00
Melissa Elkadi 90d5641770 Filling, queuing and sending UCI ind to gNB
Currently, the pull8 in nFAPI of the VNF
is failing.
2021-06-30 17:21:41 -07:00
Melissa Elkadi fc79bb1c91 Updating dropping of PUSCH if repeated sfn/slot
The previous two commits did not correctly check
the gNB sfn and slot. The code now correctly sets
the slot in which the PUSCH is SCHEDULED, not the slot
the rx is expected. Also, the sfn/slot is only updated
if we do in fact schedule a PUSCH.
2021-06-30 11:32:57 -07:00
Melissa Elkadi ad653819b9 Not sending DCI if repeated sfn/slot
Also, we are now updating ul_tti_future
for every index in the array, not just slot 7, 8, and 9.
2021-06-29 15:51:48 -07:00
Melissa Elkadi 30fe619000 Dont send DCIs repeatedly for a given sfn/slot
Although the timing isnt perfect, if the VNF adjusts
in the middle of scheduling a DCI the gNB would try to
send two DCIs for a certain sfn/slot; this commit will
stop that from happening. The timing issue still persits.
2021-06-29 13:24:07 -07:00
Melissa Elkadi 5ee9bc2cc9 Updating matacher function for de-queuing 2021-06-28 16:58:01 -07:00
Melissa Elkadi f61d5b74b1 Removing free of unallocated memory 2021-06-28 15:02:04 -07:00
Melissa 01127c6ce7 Merge branch 'episys/sync-nfapi-with-muep-more' into 'episys/x2_trigger_nsa'
Sync more NFAPI changes from multi-ue-proxy.git

See merge request aburger/openairinterface5g!45
2021-06-28 14:53:37 -07:00
Michael Cook 9ac2d7724d Merge remote-tracking branch 'origin/episys/x2_trigger_nsa' into episys/sync-nfapi-with-muep-more 2021-06-28 17:44:21 -04:00
Melissa 13c1379958 Merge branch 'episys/sync-nfapi-with-muep' into 'episys/x2_trigger_nsa'
Sync nfapi_p[57].c with multi-ue-proxy.git

See merge request aburger/openairinterface5g!44
2021-06-28 14:43:39 -07:00
Michael Cook cf4758a742 Merge remote-tracking branch 'origin/episys/x2_trigger_nsa' into episys/sync-nfapi-with-muep-more 2021-06-28 17:40:00 -04:00
Michael Cook 4fb933cbdf Copy review feedback from multi-ue-proxy.git 2021-06-28 17:39:16 -04:00
Melissa Elkadi 9b96dd2a5f Unqueue based on sfn_slot
Also, added functionality to fill tx_req in NR UE
when a DCI is received after the slot indication.
2021-06-28 12:39:28 -07:00
Michael Cook e54896591b Sync more NFAPI changes from multi-ue-proxy.git
Most notably, nfapi_rx_indication_pdu_t.data type is changed from
`uint8_t*` to `uint8_t[]`.  Also, renamed from `data` to
`rx_ind_data` to make it easier to find.
2021-06-26 10:20:48 -07:00
Michael Cook 9a0926bdee Sync nfapi_p[57].c with multi-ue-proxy.git
These are all superficial, low-risk changes
2021-06-26 09:08:54 -07:00
Melissa Elkadi 46488432e6 This commit includes the iisc pnf_p7 slot tick fix
It also includes the queuing development. The idea
is that the 5G Userplane messages will be filled
and configured the same as previous commit, but
the uplink messages will be queued and then sent to
the gNB during the correct slot. Still WIP.
2021-06-25 14:49:02 -07:00
Melissa Elkadi 912cba163d Enabled VNF timing adjustments.
Also ported in new gNB ulsch scheduler code from
Eurecom/develop branch.
2021-06-24 15:33:22 -07:00
Melissa 3da3b20c86 Merge branch 'episys/use-Werror' into 'episys/x2_trigger_nsa'
Enable -Werror compiler option

See merge request aburger/openairinterface5g!43
2021-06-21 14:11:53 -07:00
Michael Cook 96efbb2cab Add -Werror compiler option
Fix some warnings, too.
2021-06-21 14:11:53 -07:00
Melissa Elkadi 3605fed468 Already filling rx_ind so removing stub functions 2021-06-21 14:05:54 -07:00
Melissa Elkadi e3bf4940fd WIP: Not working or building.
Starting to complete the final fill of
dl_indication and an rx_indication
2021-06-18 15:06:59 -07:00
Melissa Elkadi c7875ce24c Properly filling the dci_format
This commit properly is filing the dci_format but the
rx_ind and dl_ind has not been updated in the NR UE
prior to sending to gNB. The chnages in this commit
to properly fill the dci_format include:
- filling the dci canidates every slot indiction
- checking for a dl_tti/ul_tti containing a dci
- when dci payload is received we use the filled
  dci canidates to update the dci_format

Also, a bug in LTE UE is found where we are indexing
passed the end of ue_sdu array. We added a check for this.
Furthermore, in the nr_ue_scheduler we were utilizing
tx_req but the memory wasnt properly initialized.
2021-06-18 13:33:20 -07:00
Melissa 9cce04efd6 Merge branch 'episys/x2_trigger_nsa_for_multi_ues' into 'episys/x2_trigger_nsa'
Adjusted UDP port ids for multiple UE connection with proxy

See merge request aburger/openairinterface5g!41
2021-06-16 16:06:39 -07:00
Deokseong "David" Kim 591e0e1f36 Adjusted UDP port ids for multiple UE connection with proxy 2021-06-16 16:06:38 -07:00