Use proper IP addresses in E1 (#187)

Author: nplrkn

README.md

@@ -67,7 +67,7 @@ RUST_LOG=info cargo test two_workers_base --test two_workers -- --nocapture
 
 You can packet capture during these tests by running the following in parallel. 
 ```
-sudo tcpdump -w alsoran.pcap -i lo port 38472 or port 38412 or port 38462
+sudo tcpdump -w alsoran.pcap -i lo port 38472 or port 38412 or port 38462 or port 38462
 ```
 ...then Ctrl-C at the end of the test and open alsoran.pcap in Wireshark.
 

documentation/backlog.md

@@ -13,6 +13,7 @@
   - e.g. "Inital access procedure failed - Connection refused (os error 111)" at debug
 - two worker enablement (share DU configuration between workers - see [documentation/design/State - DU.md])
 - use NonEmpty instead of Vec in ASN.1 autogen if lower bound is 1
+- provide TransportAddress constructor from string (and use common struct for all XXAP libraries)
 
 ## SCALE OUT / MULTIPLE TNLA
 - Allow AMF to specify 2nd endpoint - ask worker 1
@@ -77,6 +78,7 @@
 - Distributed timers and failure path cleanup mechanism
 
 # DONE
+- Use proper 32 bit bitstrings for TransportAddress in E1AP messages (avoids Wireshark decode issue) 
 - Support for BearerContextModificationRequest in CU-UP
 - Pass CellGroupConfig from DU to UE in Rrc Reconfiguration Request
 - Use proper NAS messages from AMF-SIM to improve Wireshark trace of ODU interop

documentation/howto/odu.md

@@ -11,7 +11,7 @@ sudo ip addr add 192.168.130.81/32 dev eth0 label eth0:ODU
 sudo ip addr add 192.168.130.82/32 dev eth0 label eth0:CU_STUB
 
 # optional set up tcpdump
-sudo tcpdump -w alsoran.pcap -i lo port 38472 or port 38412
+sudo tcpdump -w alsoran.pcap -i lo port 38472 or port 38412 or port 38462
 
 # in terminal 1, projects/alsoran/gnb-cu-cp
 cargo run -- --local-ip=192.168.130.82
@@ -60,14 +60,14 @@ cargo run
 
 # In terminal 2, projects/alsoran/gnb-cu-cp
 redis-server &
-cargo run -- --local-ip=127.0.0.1
+RUST_LOG=debug cargo run -- --local-ip=127.0.0.1
 
 # In terminal 3, projects/alsoran/gnb-cu-up
-cargo run
+RUST_LOG=debug cargo run
 
 # in terminal 4, 
 ```
-sudo tcpdump -w alsoran.pcap  -i lo port 38472 or port 38412
+sudo tcpdump -w alsoran.pcap  -i lo port 38472 or port 38412 or port 38462
 ```
 
 # in terminal 5, in o-du-l2 directory

gnb-cu-cp/src/workflows/pdu_session_resource_setup.rs

@@ -3,7 +3,6 @@
 use super::{GnbCuCp, Workflow};
 use crate::datastore::UeState;
 use anyhow::Result;
-use bitvec::prelude::*;
 use e1ap::*;
 use f1ap::UeContextSetupProcedure;
 use net::SerDes;
@@ -225,10 +224,13 @@ impl<'a, G: GnbCuCp> Workflow<'a, G> {
                 maximum_i_pdatarate: None,
             },
             pdu_session_resource_dl_ambr: None,
+            // TODO: get transport information from the request
             // TODO: Frunk transmogrify would be ideal
             ng_ul_up_tnl_information: UpTnlInformation::GtpTunnel(GtpTunnel {
-                transport_layer_address: TransportLayerAddress(bitvec![u8,Msb0;0,1,1,0]),
-                gtp_teid: GtpTeid(vec![1, 2, 3, 4]),
+                transport_layer_address: TransportLayerAddress(net::ip_bits_from_string(
+                    "192.168.110.82",
+                )?),
+                gtp_teid: GtpTeid(vec![0, 0, 0, 1]),
             }),
             pdu_session_data_forwarding_information_request: None,
             pdu_session_inactivity_timer: None,
@@ -237,7 +239,7 @@ impl<'a, G: GnbCuCp> Workflow<'a, G> {
             drb_to_setup_list_ng_ran: DrbToSetupListNgRan(vec![DrbToSetupItemNgRan {
                 drb_id: DrbId(1),
                 sdap_configuration: SdapConfiguration {
-                    default_drb: DefaultDrb::True,
+                    default_drb: DefaultDrb::True, // test
                     sdap_header_ul: SdapHeaderUl::Present,
                     sdap_header_dl: SdapHeaderDl::Present,
                 },

gnb-cu-up/src/workflows/bearer_context_setup.rs

@@ -3,7 +3,6 @@
 
 use super::{GnbCuUp, Workflow};
 use anyhow::Result;
-use bitvec::prelude::*;
 use e1ap::*;
 use net::{RequestError, ResponseAction};
 
@@ -17,8 +16,8 @@ impl<'a, G: GnbCuUp> Workflow<'a, G> {
 
         // The userplane processing doesn't exist yet, but let's suppose it will be designed to
         // use the same GTP TEID on both sides for each bearer.
-        let my_uplink_address = TransportLayerAddress(bitvec![u8,Msb0;3,3,3,3]);
-        let my_downlink_address = TransportLayerAddress(bitvec![u8,Msb0;4,4,4,4]);
+        let my_uplink_address = TransportLayerAddress(net::ip_bits_from_string("3.3.3.3")?);
+        let my_downlink_address = TransportLayerAddress(net::ip_bits_from_string("4.4.4.4")?);
         let bearer_1_gtp_teid = GtpTeid(vec![1, 2, 3, 4]);
 
         self.log_message("BearerContextSetupResponse >>");

net/src/ip_bits_from_string.rs

@@ -1,7 +1,8 @@
-use async_net::{AddrParseError, IpAddr};
+use anyhow::Result;
+use async_net::IpAddr;
 use bitvec::prelude::*;
 
-pub fn ip_bits_from_string(addr: &str) -> Result<BitVec<u8, Msb0>, AddrParseError> {
+pub fn ip_bits_from_string(addr: &str) -> Result<BitVec<u8, Msb0>> {
     Ok(match addr.parse()? {
         IpAddr::V4(x) => BitVec::<_, Msb0>::from_slice(&x.octets()),
         IpAddr::V6(x) => BitVec::<_, Msb0>::from_slice(&x.octets()),