diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c index f8d1a314624baec9e3d313dbb4708dfeb9c48432..91b2b7f03eef250e9f9d8078c951bb804e470541 100644 --- a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c +++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c @@ -119,8 +119,8 @@ int eth_socket_init_raw(openair0_device *device) { } /* Construct the Ethernet header */ - ether_aton_r(device->openair0_cfg.my_addr, (struct ether_addr *)(&(eh.ether_shost))); - ether_aton_r(device->openair0_cfg.remote_addr, (struct ether_addr *)(&(eh.ether_dhost))); + ether_aton_r(local_mac, (struct ether_addr *)(&(eh.ether_shost))); + ether_aton_r(remote_mac, (struct ether_addr *)(&(eh.ether_dhost))); eh.ether_type = htons((short)device->openair0_cfg.my_port); printf("[%s] binding mod_%d to hardware address %x:%x:%x:%x:%x:%x\n",((device->host_type == BBU_HOST) ? "BBU": "RRH"),Mod_id,eh.ether_shost[0],eh.ether_shost[1],eh.ether_shost[2],eh.ether_shost[3],eh.ether_shost[4],eh.ether_shost[5]); diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c index 6d3bfc820514b319bc3b134a5020b19ae3217df7..634018f6e174c568421afa292285be5c19b841a8 100644 --- a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c +++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c @@ -343,7 +343,7 @@ int transport_init(openair0_device *device, openair0_config_t *openair0_cfg, cha int card = 0; /*hoedcoded!!!!*/ - eth->flags = ETH_UDP_MODE; + eth->flags = ETH_RAW_MODE; eth->buffer_size = (unsigned int)openair0_cfg[card].samples_per_packet*sizeof(int32_t); // buffer size = 4096 for sample_len of 1024 printf("[ETHERNET]: Initializing openair0_device for %s ...\n", ((device->host_type == BBU_HOST) ? "BBU": "RRH")); diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c index ebd9e85a324c15fa7dc730ecb9386c0e30c6c53b..e915925fe8f09da40548785e23664ff4a7ecdcc3 100644 --- a/targets/RT/USER/lte-softmodem.c +++ b/targets/RT/USER/lte-softmodem.c @@ -369,8 +369,8 @@ int16_t osa_log_verbosity = LOG_MED; #ifdef ETHERNET -//char *rrh_UE_ip = "127.0.0.1"; -//int rrh_UE_port = 51000; +char *rrh_UE_ip = "127.0.0.1"; +int rrh_UE_port = 51000; #endif /* flag given in runtime to specify if the RF head is local or remote*/ uint8_t local_remote_RF; @@ -2977,13 +2977,13 @@ int main( int argc, char **argv ) openair0_cfg[card].remote_addr = "192.168.12.242"; //openair0_cfg[card].remote_addr = "127.0.0.1"; -// openair0_cfg[card].remote_addr = "74:d4:35:cc:88:45"; + openair0_cfg[card].remote_addr = "74:d4:35:cc:88:45"; openair0_cfg[card].remote_port = 50000; openair0_cfg[card].my_addr = "192.168.12.31"; //openair0_cfg[card].my_addr = "127.0.0.1"; - //openair0_cfg[card].my_addr = "d4:be:d9:22:0a:ac"; - openair0_cfg[card].my_port = 50001; - openair0_cfg[card].tx_delay = 5; + openair0_cfg[card].my_addr = "d4:be:d9:22:0a:ac"; + openair0_cfg[card].my_port = 50000; + openair0_cfg[card].tx_delay = 10; openair0_cfg[card].tx_forward_nsamps = 0; openair0_cfg[card].txlaunch_wait = 0; openair0_cfg[card].txlaunch_wait_slotcount = 0;