Commit 1e51f954 authored by wangdong's avatar wangdong

L2 nFAPI

parent d02a2806
...@@ -134,7 +134,7 @@ eNBs = ...@@ -134,7 +134,7 @@ eNBs =
}; };
////////// MME parameters: ////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; mme_ip_address = ( { ipv4 = "127.0.0.20";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
...@@ -152,12 +152,13 @@ eNBs = ...@@ -152,12 +152,13 @@ eNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_INTERFACE_NAME_FOR_S1_MME = "lo";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.10";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_INTERFACE_NAME_FOR_S1U = "lo";
ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.10";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.10";
ENB_PORT_FOR_X2C = 36422; # Spec 36422 ENB_PORT_FOR_X2C = 36422; # Spec 36422
}; };
......
...@@ -174,7 +174,7 @@ eNBs = ...@@ -174,7 +174,7 @@ eNBs =
////////// MME parameters: ////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; mme_ip_address = ( { ipv4 = "127.0.0.20";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
...@@ -192,12 +192,13 @@ eNBs = ...@@ -192,12 +192,13 @@ eNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_INTERFACE_NAME_FOR_S1_MME = "lo";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.10";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_INTERFACE_NAME_FOR_S1U = "lo";
ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.10";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.10";
ENB_PORT_FOR_X2C = 36422; # Spec 36422 ENB_PORT_FOR_X2C = 36422; # Spec 36422
}; };
} }
...@@ -248,8 +249,8 @@ THREAD_STRUCT = ( ...@@ -248,8 +249,8 @@ THREAD_STRUCT = (
NETWORK_CONTROLLER : NETWORK_CONTROLLER :
{ {
FLEXRAN_ENABLED = "no"; FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "eth0"; FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "CI_MME_IP_ADDR"; FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_PORT = 2210; FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache"; FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no"; FLEXRAN_AWAIT_RECONF = "no";
......
This diff is collapsed.
...@@ -172,7 +172,7 @@ eNBs = ...@@ -172,7 +172,7 @@ eNBs =
////////// MME parameters: ////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; mme_ip_address = ( { ipv4 = "127.0.0.20";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
...@@ -190,24 +190,26 @@ eNBs = ...@@ -190,24 +190,26 @@ eNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
ENB_INTERFACE_NAME_FOR_S1_MME = "ens3"; ENB_INTERFACE_NAME_FOR_S1_MME = "lo";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.10";
ENB_INTERFACE_NAME_FOR_S1U = "ens3";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_INTERFACE_NAME_FOR_S1U = "lo";
ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.10";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_PORT_FOR_X2C = 36422; # Spec 36422 ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.10";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
}; };
} }
); );
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1; num_cc = 1;
local_s_if_name = "ens3"; local_s_if_name = "enp1s0";
remote_s_address = "CI_UE_IP_ADDR"; remote_s_address = "192.168.0.11";
local_s_address = "CI_ENB_IP_ADDR"; local_s_address = "192.168.0.10";
local_s_portc = 50001; local_s_portc = 50001;
remote_s_portc = 50000; remote_s_portc = 50000;
local_s_portd = 50011; local_s_portd = 50011;
......
...@@ -2825,7 +2825,7 @@ target_link_libraries (nr-softmodem ${LIBXML2_LIBRARIES}) ...@@ -2825,7 +2825,7 @@ target_link_libraries (nr-softmodem ${LIBXML2_LIBRARIES})
target_link_libraries (nr-softmodem pthread m ${CONFIG_LIB} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${XFORMS_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES}) target_link_libraries (nr-softmodem pthread m ${CONFIG_LIB} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${XFORMS_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
target_link_libraries (nr-softmodem ${LIB_LMS_LIBRARIES}) target_link_libraries (nr-softmodem ${LIB_LMS_LIBRARIES})
target_link_libraries (nr-softmodem ${T_LIB}) target_link_libraries (nr-softmodem ${T_LIB})
target_link_libraries (nr-softmodem -lsocket -ls2j -lcjson)
add_dependencies( nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc ) add_dependencies( nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc )
# nr-uesoftmodem is UE implementation # nr-uesoftmodem is UE implementation
####################################### #######################################
......
...@@ -967,40 +967,39 @@ eNB_dlsch_ulsch_scheduler(module_id_t module_idP, ...@@ -967,40 +967,39 @@ eNB_dlsch_ulsch_scheduler(module_id_t module_idP,
} }
} }
// //建立Socket链接,并存放在RC.sockfd中 //建立Socket链接,并存放在RC.sockfd中
// //然后就是创建Socket连接,并发送 //然后就是创建Socket连接,并发送
// static int flag =0; static int flag =0;
// #define MAXLINE 800000 #define MAXLINE 800000
// #define SER_PORT 23333 #define SER_PORT 23333
// int buffer = 0; int buffer = 0;
// if(flag==0){ if(flag==0){
// LOG_I(MAC,"[SOCKET]Socket \n"); LOG_I(MAC,"[SOCKET]Socket \n");
// struct sockaddr_in servaddr; struct sockaddr_in servaddr;
// int sockfd = 0; int sockfd = 0;
// sockfd = socket(AF_INET, SOCK_STREAM, 0); sockfd = socket(AF_INET, SOCK_STREAM, 0);
// RC.sockfd = sockfd; fcntl(sockfd,F_SETFL,O_NONBLOCK);
// printf("[SOCKET]Socket ID :&RC.mac[Mod_id]->sockfd= %d\n", RC.sockfd); //buffer = sockfd; RC.sockfd = sockfd;
// bzero(&servaddr, sizeof(servaddr)); printf("[SOCKET]Socket ID :&RC.mac[Mod_id]->sockfd= %d\n", RC.sockfd); //buffer = sockfd;
// servaddr.sin_family = AF_INET; bzero(&servaddr, sizeof(servaddr));
// inet_pton(AF_INET, "127.0.0.1", &servaddr.sin_addr); servaddr.sin_family = AF_INET;
// servaddr.sin_port = htons(SER_PORT); inet_pton(AF_INET, "127.0.0.1", &servaddr.sin_addr);
// if (connect(sockfd, (struct sockaddr *)&servaddr, sizeof(servaddr)) < 0) servaddr.sin_port = htons(SER_PORT);
// { connect(sockfd, (struct sockaddr *)&servaddr, sizeof(servaddr));
// printf("[SOCKET]connet error:%s\n", strerror(errno));
// } //链接服务器 flag = flag +1;
// else{ int num;
// flag = flag +1; char *json_data = NULL;
// int num; json_data = "Begin Connection to Python Server";
// char *json_data = NULL; int n = strlen(json_data);
// json_data = "Begin Connection to Python Server"; char buf[MAXLINE];
// int n = strlen(json_data); write(sockfd, json_data, n);
// char buf[MAXLINE]; read(sockfd, buf, MAXLINE);
// write(sockfd, json_data, n); printf("[SOCKET]Response from server: %s\n", buf);
// read(sockfd, buf, MAXLINE);
// printf("[SOCKET]Response from server: %s\n", buf);
// }
// } }
......
...@@ -1682,7 +1682,7 @@ schedule_ue_spec_br(module_id_t module_idP, ...@@ -1682,7 +1682,7 @@ schedule_ue_spec_br(module_id_t module_idP,
T_INT(subframeP), T_INT(subframeP),
T_INT(harq_pid), T_INT(harq_pid),
T_BUFFER(UE_info->DLSCH_pdu[CC_id][0][UE_id].payload[0], TBS)); T_BUFFER(UE_info->DLSCH_pdu[CC_id][0][UE_id].payload[0], TBS));
/* Do PUCCH power control */ /* Do PUCCH power control 通过TPC实现闭环功率控制,一帧一次 */
/* This is the snr */ /* This is the snr */
/* unit is not dBm, it's special from nfapi, convert to dBm */ /* unit is not dBm, it's special from nfapi, convert to dBm */
snr = (5 * ue_sched_ctl->pucch1_snr[CC_id] - 640) / 10; snr = (5 * ue_sched_ctl->pucch1_snr[CC_id] - 640) / 10;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment