Commit f83d602e authored by Lionel Gauthier's avatar Lionel Gauthier

patches13/0015-fixed-some-compiler-warnings.patch

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7061 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 826264ea
...@@ -640,7 +640,7 @@ gtpv1u_create_s1u_tunnel( ...@@ -640,7 +640,7 @@ gtpv1u_create_s1u_tunnel(
hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS; hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS;
int i; int i;
ebi_t eps_bearer_id = 0; ebi_t eps_bearer_id = 0;
int ipv4_addr = 0; // int ipv4_addr = 0;
int ip_offset = 0; int ip_offset = 0;
in_addr_t in_addr; in_addr_t in_addr;
int addrs_length_in_bytes= 0; int addrs_length_in_bytes= 0;
......
...@@ -516,7 +516,7 @@ nwGtpv1uProcessGpdu( NwGtpv1uStackT *thiz, ...@@ -516,7 +516,7 @@ nwGtpv1uProcessGpdu( NwGtpv1uStackT *thiz,
NwGtpv1uMsgHeaderT *msgHdr = NULL; NwGtpv1uMsgHeaderT *msgHdr = NULL;
NwGtpv1uTunnelEndPointT *pTunnelEndPoint = NULL; NwGtpv1uTunnelEndPointT *pTunnelEndPoint = NULL;
NwGtpv1uTunnelEndPointT tunnelEndPointKey; NwGtpv1uTunnelEndPointT tunnelEndPointKey;
NwU16T hdr_len = 0; // NwU16T hdr_len = 0;
#if defined(LOG_GTPU) && LOG_GTPU > 0 #if defined(LOG_GTPU) && LOG_GTPU > 0
NW_ENTER(thiz); NW_ENTER(thiz);
......
...@@ -126,7 +126,6 @@ nwGtpv1uGpduMsgNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle, ...@@ -126,7 +126,6 @@ nwGtpv1uGpduMsgNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
{ {
NwGtpv1uStackT *pStack = (NwGtpv1uStackT *) hGtpuStackHandle; NwGtpv1uStackT *pStack = (NwGtpv1uStackT *) hGtpuStackHandle;
NwGtpv1uMsgT *pMsg; NwGtpv1uMsgT *pMsg;
NwU32T header_len = 0;
NwU32T msgExtraLen = 0; NwU32T msgExtraLen = 0;
if(gpGtpv1uMsgPool) { if(gpGtpv1uMsgPool) {
......
...@@ -1049,7 +1049,7 @@ static int _at_response_encode_cgpaddr(char* buffer, const at_response_t* data) ...@@ -1049,7 +1049,7 @@ static int _at_response_encode_cgpaddr(char* buffer, const at_response_t* data)
if (cgpaddr->PDP_addr_2[i] != NULL) { if (cgpaddr->PDP_addr_2[i] != NULL) {
/* IPv6 Link-local address prefixe */ /* IPv6 Link-local address prefixe */
offset += sprintf(buffer+offset, offset += sprintf(buffer+offset,
",%hhu.%hhu.%hhu.%hhu.%hhu.%hhu.%hhu.%hhu", ",%u.%u.%u.%u.%u.%u.%u.%u",
0xfe, 0x80, 0, 0, 0, 0, 0, 0); 0xfe, 0x80, 0, 0, 0, 0, 0, 0);
/* IPv6 Link-local address */ /* IPv6 Link-local address */
offset += sprintf(buffer+offset, offset += sprintf(buffer+offset,
......
...@@ -863,8 +863,8 @@ static int _security_kenb(const OctetString *kasme, OctetString *kenb, ...@@ -863,8 +863,8 @@ static int _security_kenb(const OctetString *kasme, OctetString *kenb,
* S = FC(0x11) || UL NAS Count || 0x00 0x04 * S = FC(0x11) || UL NAS Count || 0x00 0x04
*/ */
UInt8_t input[32]; UInt8_t input[32];
UInt16_t length = 4; // UInt16_t length = 4;
int offset = 0; // int offset = 0;
LOG_TRACE(INFO, "%s with count= %d", __FUNCTION__, count); LOG_TRACE(INFO, "%s with count= %d", __FUNCTION__, count);
memset(input, 0, 32); memset(input, 0, 32);
......
...@@ -125,7 +125,7 @@ sctp_handle_new_association_req( ...@@ -125,7 +125,7 @@ sctp_handle_new_association_req(
const sctp_new_association_req_t * const sctp_new_association_req_p) const sctp_new_association_req_t * const sctp_new_association_req_p)
{ {
int sd; int sd;
int32_t assoc_id; int32_t assoc_id = 0;
struct sctp_event_subscribe events; struct sctp_event_subscribe events;
...@@ -279,14 +279,14 @@ sctp_handle_new_association_req( ...@@ -279,14 +279,14 @@ sctp_handle_new_association_req(
&addr[address_index].sin_addr.s_addr) != 1) &addr[address_index].sin_addr.s_addr) != 1)
{ {
SCTP_ERROR("Failed to convert ipv6 address %*s to network type\n", SCTP_ERROR("Failed to convert ipv6 address %*s to network type\n",
strlen(sctp_new_association_req_p->remote_address.ipv6_address), (int)strlen(sctp_new_association_req_p->remote_address.ipv6_address),
sctp_new_association_req_p->remote_address.ipv6_address); sctp_new_association_req_p->remote_address.ipv6_address);
close(sd); close(sd);
return; return;
} }
SCTP_DEBUG("Converted ipv6 address %*s to network type\n", SCTP_DEBUG("Converted ipv6 address %*s to network type\n",
strlen(sctp_new_association_req_p->remote_address.ipv6_address), (int)strlen(sctp_new_association_req_p->remote_address.ipv6_address),
sctp_new_association_req_p->remote_address.ipv6_address); sctp_new_association_req_p->remote_address.ipv6_address);
addr[address_index].sin_family = AF_INET6; addr[address_index].sin_family = AF_INET6;
...@@ -298,14 +298,14 @@ sctp_handle_new_association_req( ...@@ -298,14 +298,14 @@ sctp_handle_new_association_req(
&addr[address_index].sin_addr.s_addr) != 1) &addr[address_index].sin_addr.s_addr) != 1)
{ {
SCTP_ERROR("Failed to convert ipv4 address %*s to network type\n", SCTP_ERROR("Failed to convert ipv4 address %*s to network type\n",
strlen(sctp_new_association_req_p->remote_address.ipv4_address), (int)strlen(sctp_new_association_req_p->remote_address.ipv4_address),
sctp_new_association_req_p->remote_address.ipv4_address); sctp_new_association_req_p->remote_address.ipv4_address);
close(sd); close(sd);
return; return;
} }
SCTP_DEBUG("Converted ipv4 address %*s to network type\n", SCTP_DEBUG("Converted ipv4 address %*s to network type\n",
strlen(sctp_new_association_req_p->remote_address.ipv4_address), (int)strlen(sctp_new_association_req_p->remote_address.ipv4_address),
sctp_new_association_req_p->remote_address.ipv4_address); sctp_new_association_req_p->remote_address.ipv4_address);
addr[address_index].sin_family = AF_INET; addr[address_index].sin_family = AF_INET;
...@@ -349,7 +349,7 @@ sctp_handle_new_association_req( ...@@ -349,7 +349,7 @@ sctp_handle_new_association_req(
addr6.sin6_port = htons(sctp_new_association_req_p->port); addr6.sin6_port = htons(sctp_new_association_req_p->port);
if (bind(sd, (struct sockaddr*)&addr6, sizeof(addr6)) < 0) { if (bind(sd, (struct sockaddr*)&addr6, sizeof(addr6)) < 0) {
SCTP_ERROR("Failed to bind the socket %d to address any (v4/v6): %s\n", SCTP_ERROR("Failed to bind the socket to address any (v4/v6): %s\n",
strerror(errno)); strerror(errno));
close(sd); close(sd);
return; return;
...@@ -396,7 +396,7 @@ void sctp_send_data( ...@@ -396,7 +396,7 @@ void sctp_send_data(
} }
if (sctp_data_req_p->stream >= sctp_cnx->out_streams) { if (sctp_data_req_p->stream >= sctp_cnx->out_streams) {
SCTP_ERROR("Requested stream (%u) >= nb out streams\n", SCTP_ERROR("Requested stream (%"PRIu16") >= nb out streams (%"PRIu16")\n",
sctp_data_req_p->stream, sctp_cnx->out_streams); sctp_data_req_p->stream, sctp_cnx->out_streams);
return; return;
} }
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "security_types.h" #include "security_types.h"
#include "secu_defs.h" #include "secu_defs.h"
void kdf(uint8_t *key, uint16_t key_len, uint8_t *s, uint16_t s_len, uint8_t *out, void kdf(const uint8_t *key, uint16_t key_len, uint8_t *s, uint16_t s_len, uint8_t *out,
uint16_t out_len) uint16_t out_len)
{ {
struct hmac_sha256_ctx ctx; struct hmac_sha256_ctx ctx;
......
...@@ -108,7 +108,6 @@ int nas_stream_encrypt_eea1(nas_stream_cipher_t *stream_cipher, uint8_t *out) ...@@ -108,7 +108,6 @@ int nas_stream_encrypt_eea1(nas_stream_cipher_t *stream_cipher, uint8_t *out)
stream_cipher->message[ceil_index - 1] = stream_cipher->message[ceil_index - 1] & (uint8_t)(0xFF << (8 - zero_bit)); stream_cipher->message[ceil_index - 1] = stream_cipher->message[ceil_index - 1] & (uint8_t)(0xFF << (8 - zero_bit));
} }
free(KS); free(KS);
*out = stream_cipher->message;
memcpy(out, stream_cipher->message, n*4); memcpy(out, stream_cipher->message, n*4);
if (zero_bit > 0) { if (zero_bit > 0) {
out[ceil_index - 1] = stream_cipher->message[ceil_index - 1]; out[ceil_index - 1] = stream_cipher->message[ceil_index - 1];
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#define SECU_DIRECTION_UPLINK 0 #define SECU_DIRECTION_UPLINK 0
#define SECU_DIRECTION_DOWNLINK 1 #define SECU_DIRECTION_DOWNLINK 1
void kdf(uint8_t *key, void kdf(const uint8_t *key,
uint16_t key_len, uint16_t key_len,
uint8_t *s, uint8_t *s,
uint16_t s_len, uint16_t s_len,
......
...@@ -167,7 +167,7 @@ int udp_eNB_create_socket(int port, char *ip_addr, task_id_t task_id) ...@@ -167,7 +167,7 @@ int udp_eNB_create_socket(int port, char *ip_addr, task_id_t task_id)
sin.sin_family = AF_INET; sin.sin_family = AF_INET;
sin.sin_port = htons(port); sin.sin_port = htons(port);
if (ip_addr == NULL) { if (ip_addr == NULL) {
sin.sin_addr.s_addr = inet_addr(INADDR_ANY); sin.sin_addr.s_addr = INADDR_ANY;
} else { } else {
sin.sin_addr.s_addr = inet_addr(ip_addr); sin.sin_addr.s_addr = inet_addr(ip_addr);
} }
......
...@@ -81,7 +81,6 @@ void free_eNB_dlsch(LTE_eNB_DLSCH_t *dlsch) { ...@@ -81,7 +81,6 @@ void free_eNB_dlsch(LTE_eNB_DLSCH_t *dlsch) {
msg("Freeing dlsch process %d b (%p)\n",i,dlsch->harq_processes[i]->b); msg("Freeing dlsch process %d b (%p)\n",i,dlsch->harq_processes[i]->b);
#endif #endif
} }
if (dlsch->harq_processes[i]->c) {
#ifdef DEBUG_DLSCH_FREE #ifdef DEBUG_DLSCH_FREE
msg("Freeing dlsch process %d c (%p)\n",i,dlsch->harq_processes[i]->c); msg("Freeing dlsch process %d c (%p)\n",i,dlsch->harq_processes[i]->c);
#endif #endif
...@@ -95,7 +94,6 @@ void free_eNB_dlsch(LTE_eNB_DLSCH_t *dlsch) { ...@@ -95,7 +94,6 @@ void free_eNB_dlsch(LTE_eNB_DLSCH_t *dlsch) {
dlsch->harq_processes[i]->c[r] = NULL; dlsch->harq_processes[i]->c[r] = NULL;
} }
} }
}
free16(dlsch->harq_processes[i],sizeof(LTE_DL_eNB_HARQ_t)); free16(dlsch->harq_processes[i],sizeof(LTE_DL_eNB_HARQ_t));
dlsch->harq_processes[i] = NULL; dlsch->harq_processes[i] = NULL;
} }
......
...@@ -555,7 +555,8 @@ unsigned int is_phich_subframe(LTE_DL_FRAME_PARMS *frame_parms,unsigned char sub ...@@ -555,7 +555,8 @@ unsigned int is_phich_subframe(LTE_DL_FRAME_PARMS *frame_parms,unsigned char sub
double aggregate_eNB_UE_localization_stats(PHY_VARS_eNB *phy_vars_eNB, int8_t UE_id, frame_t frame, sub_frame_t subframe, int32_t UE_tx_power_dB){ double aggregate_eNB_UE_localization_stats(PHY_VARS_eNB *phy_vars_eNB, int8_t UE_id, frame_t frame, sub_frame_t subframe, int32_t UE_tx_power_dB){
// parameters declaration // parameters declaration
int8_t Mod_id, CC_id; int8_t Mod_id, CC_id;
int32_t harq_pid, avg_power, avg_rssi, median_power, median_rssi, median_subcarrier_rss, median_TA, median_TA_update, ref_timestamp_ms, current_timestamp_ms; // int32_t harq_pid;
int32_t avg_power, avg_rssi, median_power, median_rssi, median_subcarrier_rss, median_TA, median_TA_update, ref_timestamp_ms, current_timestamp_ms;
char cqis[100], sub_powers[2048]; char cqis[100], sub_powers[2048];
int len = 0, i; int len = 0, i;
struct timeval ts; struct timeval ts;
......
...@@ -2667,7 +2667,7 @@ void process_HARQ_feedback(uint8_t UE_id, ...@@ -2667,7 +2667,7 @@ void process_HARQ_feedback(uint8_t UE_id,
// Clear NAK stats and adjust mcs offset // Clear NAK stats and adjust mcs offset
// after measurement window timer expires // after measurement window timer expires
if ((ue_stats->dlsch_sliding_cnt == dlsch->ra_window_size) ) { if (ue_stats->dlsch_sliding_cnt == dlsch->ra_window_size) {
if ((ue_stats->dlsch_mcs_offset == 0) && (ue_stats->dlsch_NAK_round0 < 2)) if ((ue_stats->dlsch_mcs_offset == 0) && (ue_stats->dlsch_NAK_round0 < 2))
ue_stats->dlsch_mcs_offset = 1; ue_stats->dlsch_mcs_offset = 1;
if ((ue_stats->dlsch_mcs_offset == 1) && (ue_stats->dlsch_NAK_round0 > 2)) if ((ue_stats->dlsch_mcs_offset == 1) && (ue_stats->dlsch_NAK_round0 > 2))
......
...@@ -834,20 +834,22 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP) ...@@ -834,20 +834,22 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
void pdcp_fifo_read_input_sdus_from_otg (const protocol_ctxt_t* const ctxt_pP) { void pdcp_fifo_read_input_sdus_from_otg (const protocol_ctxt_t* const ctxt_pP) {
unsigned char *otg_pkt=NULL; unsigned char *otg_pkt=NULL;
module_id_t src_id, module_id; // src for otg module_id_t src_id; // src for otg
module_id_t dst_id; // dst for otg module_id_t dst_id; // dst for otg
rb_id_t rb_id; rb_id_t rb_id;
signed long pkt_size=0; signed long pkt_size=0;
static unsigned int pkt_cnt_enb=0, pkt_cnt_ue=0;
uint8_t pdcp_mode, is_ue=0;
Packet_otg_elt_t *otg_pkt_info=NULL;
int result;
protocol_ctxt_t ctxt; protocol_ctxt_t ctxt;
src_id = ctxt_pP->enb_module_id; src_id = ctxt_pP->enb_module_id;
// we need to add conditions to avoid transmitting data when the UE is not RRC connected. // we need to add conditions to avoid transmitting data when the UE is not RRC connected.
#if defined(USER_MODE) && defined(OAI_EMU) #if defined(USER_MODE) && defined(OAI_EMU)
module_id_t module_id;
static unsigned int pkt_cnt_enb=0, pkt_cnt_ue=0;
uint8_t pdcp_mode, is_ue=0;
Packet_otg_elt_t *otg_pkt_info=NULL;
int result;
if (oai_emulation.info.otg_enabled ==1 ){ if (oai_emulation.info.otg_enabled ==1 ){
module_id = (ctxt_pP->enb_flag == 1) ? ctxt_pP->enb_module_id : ctxt_pP->ue_module_id+NB_eNB_INST; module_id = (ctxt_pP->enb_flag == 1) ? ctxt_pP->enb_module_id : ctxt_pP->ue_module_id+NB_eNB_INST;
//rb_id = (ctxt_pP->enb_flag == 1) ? ctxt_pP->enb_module_id * MAX_NUM_RB + DTCH : (NB_eNB_INST + UE_index -1 ) * MAX_NUM_RB + DTCH ; //rb_id = (ctxt_pP->enb_flag == 1) ? ctxt_pP->enb_module_id * MAX_NUM_RB + DTCH : (NB_eNB_INST + UE_index -1 ) * MAX_NUM_RB + DTCH ;
......
...@@ -798,7 +798,7 @@ rlc_am_mac_data_indication ( ...@@ -798,7 +798,7 @@ rlc_am_mac_data_indication (
) )
{ {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
rlc_am_entity_t *l_rlc_p = (rlc_am_entity_t *) rlc_pP; // rlc_am_entity_t *l_rlc_p = (rlc_am_entity_t *) rlc_pP;
/*rlc_am_control_pdu_info_t control_pdu_info; /*rlc_am_control_pdu_info_t control_pdu_info;
int num_li; int num_li;
int16_t tb_size;*/ int16_t tb_size;*/
......
...@@ -68,7 +68,7 @@ rlc_am_rx_list_insert_pdu( ...@@ -68,7 +68,7 @@ rlc_am_rx_list_insert_pdu(
if (pdu_info_p->sn < pdu_info_cursor_p->sn) { if (pdu_info_p->sn < pdu_info_cursor_p->sn) {
if (previous_cursor_p != NULL) { if (previous_cursor_p != NULL) {
pdu_info_previous_cursor_p = &((rlc_am_rx_pdu_management_t*)(previous_cursor_p->data))->pdu_info; pdu_info_previous_cursor_p = &((rlc_am_rx_pdu_management_t*)(previous_cursor_p->data))->pdu_info;
if ((pdu_info_previous_cursor_p->sn == pdu_info_p->sn)) { if (pdu_info_previous_cursor_p->sn == pdu_info_p->sn) {
if (pdu_info_p->rf != pdu_info_previous_cursor_p->rf) { if (pdu_info_p->rf != pdu_info_previous_cursor_p->rf) {
LOG_N(RLC, "[FRAME %05u][%s][RLC_AM][MOD %u/%u][RB %u][INSERT PDU] LINE %d RX PDU SN %04d WRONG RF -> DROPPED (vr(mr) < vr(r) and sn >= vr(r))\n", LOG_N(RLC, "[FRAME %05u][%s][RLC_AM][MOD %u/%u][RB %u][INSERT PDU] LINE %d RX PDU SN %04d WRONG RF -> DROPPED (vr(mr) < vr(r) and sn >= vr(r))\n",
ctxt_pP->frame, ctxt_pP->frame,
...@@ -121,7 +121,7 @@ rlc_am_rx_list_insert_pdu( ...@@ -121,7 +121,7 @@ rlc_am_rx_list_insert_pdu(
if (previous_cursor_p != NULL) { if (previous_cursor_p != NULL) {
pdu_info_previous_cursor_p = &((rlc_am_rx_pdu_management_t*)(previous_cursor_p->data))->pdu_info; pdu_info_previous_cursor_p = &((rlc_am_rx_pdu_management_t*)(previous_cursor_p->data))->pdu_info;
if ((pdu_info_previous_cursor_p->sn == pdu_info_cursor_p->sn)) { if (pdu_info_previous_cursor_p->sn == pdu_info_cursor_p->sn) {
if ((pdu_info_previous_cursor_p->so + pdu_info_previous_cursor_p->payload_size - 1) < pdu_info_p->so) { if ((pdu_info_previous_cursor_p->so + pdu_info_previous_cursor_p->payload_size - 1) < pdu_info_p->so) {
LOG_D(RLC, "[FRAME %05u][%s][RLC_AM][MOD %u/%u][RB %u][INSERT PDU] LINE %d RX PDU SN %04d SEGMENT OFFSET %05d (vr(mr) < vr(r) and sn >= vr(r))\n", LOG_D(RLC, "[FRAME %05u][%s][RLC_AM][MOD %u/%u][RB %u][INSERT PDU] LINE %d RX PDU SN %04d SEGMENT OFFSET %05d (vr(mr) < vr(r) and sn >= vr(r))\n",
...@@ -265,7 +265,7 @@ rlc_am_rx_list_insert_pdu( ...@@ -265,7 +265,7 @@ rlc_am_rx_list_insert_pdu(
if (pdu_info_p->sn > pdu_info_cursor_p->sn) { if (pdu_info_p->sn > pdu_info_cursor_p->sn) {
if (previous_cursor_p != NULL) { if (previous_cursor_p != NULL) {
pdu_info_previous_cursor_p = &((rlc_am_rx_pdu_management_t*)(previous_cursor_p->data))->pdu_info; pdu_info_previous_cursor_p = &((rlc_am_rx_pdu_management_t*)(previous_cursor_p->data))->pdu_info;
if ((pdu_info_previous_cursor_p->sn == pdu_info_cursor_p->sn)) { if (pdu_info_previous_cursor_p->sn == pdu_info_cursor_p->sn) {
if (pdu_info_p->rf != pdu_info_previous_cursor_p->rf) { if (pdu_info_p->rf != pdu_info_previous_cursor_p->rf) {
LOG_N(RLC, "[FRAME %05u][%s][RLC_AM][MOD %u/%u][RB %u][INSERT PDU] LINE %d RX PDU SN %04d WRONG RF -> DROPPED (vr(mr) < vr(r) and sn >= vr(r))\n", LOG_N(RLC, "[FRAME %05u][%s][RLC_AM][MOD %u/%u][RB %u][INSERT PDU] LINE %d RX PDU SN %04d WRONG RF -> DROPPED (vr(mr) < vr(r) and sn >= vr(r))\n",
ctxt_pP->frame, ctxt_pP->frame,
...@@ -316,7 +316,7 @@ rlc_am_rx_list_insert_pdu( ...@@ -316,7 +316,7 @@ rlc_am_rx_list_insert_pdu(
if (previous_cursor_p != NULL) { if (previous_cursor_p != NULL) {
pdu_info_previous_cursor_p = &((rlc_am_rx_pdu_management_t*)(previous_cursor_p->data))->pdu_info; pdu_info_previous_cursor_p = &((rlc_am_rx_pdu_management_t*)(previous_cursor_p->data))->pdu_info;
if ((pdu_info_previous_cursor_p->sn == pdu_info_cursor_p->sn)) { if (pdu_info_previous_cursor_p->sn == pdu_info_cursor_p->sn) {
if ((pdu_info_p->so + pdu_info_p->payload_size - 1) < pdu_info_previous_cursor_p->so) { if ((pdu_info_p->so + pdu_info_p->payload_size - 1) < pdu_info_previous_cursor_p->so) {
LOG_D(RLC, "[FRAME %05u][%s][RLC_AM][MOD %u/%u][RB %u][INSERT PDU] LINE %d RX PDU SN %04d SEGMENT OFFSET %05d (vr(mr) < vr(r) and sn < vr(r))\n", LOG_D(RLC, "[FRAME %05u][%s][RLC_AM][MOD %u/%u][RB %u][INSERT PDU] LINE %d RX PDU SN %04d SEGMENT OFFSET %05d (vr(mr) < vr(r) and sn < vr(r))\n",
...@@ -462,7 +462,7 @@ rlc_am_rx_list_insert_pdu( ...@@ -462,7 +462,7 @@ rlc_am_rx_list_insert_pdu(
if (previous_cursor_p != NULL) { if (previous_cursor_p != NULL) {
pdu_info_previous_cursor_p = &((rlc_am_rx_pdu_management_t*)(previous_cursor_p->data))->pdu_info; pdu_info_previous_cursor_p = &((rlc_am_rx_pdu_management_t*)(previous_cursor_p->data))->pdu_info;
if ((pdu_info_previous_cursor_p->sn == pdu_info_p->sn)) { if (pdu_info_previous_cursor_p->sn == pdu_info_p->sn) {
if (pdu_info_p->rf != pdu_info_previous_cursor_p->rf) { if (pdu_info_p->rf != pdu_info_previous_cursor_p->rf) {
LOG_N(RLC, "[FRAME %05u][%s][RLC_AM][MOD %u/%u][RB %u][INSERT PDU] LINE %d RX PDU SN %04d WRONG RF -> DROPPED (vr(mr) > vr(r))\n", LOG_N(RLC, "[FRAME %05u][%s][RLC_AM][MOD %u/%u][RB %u][INSERT PDU] LINE %d RX PDU SN %04d WRONG RF -> DROPPED (vr(mr) > vr(r))\n",
ctxt_pP->frame, ctxt_pP->frame,
...@@ -516,7 +516,7 @@ rlc_am_rx_list_insert_pdu( ...@@ -516,7 +516,7 @@ rlc_am_rx_list_insert_pdu(
if (previous_cursor_p != NULL) { if (previous_cursor_p != NULL) {
pdu_info_previous_cursor_p = &((rlc_am_rx_pdu_management_t*)(previous_cursor_p->data))->pdu_info; pdu_info_previous_cursor_p = &((rlc_am_rx_pdu_management_t*)(previous_cursor_p->data))->pdu_info;
if ((pdu_info_previous_cursor_p->sn == pdu_info_cursor_p->sn)) { if (pdu_info_previous_cursor_p->sn == pdu_info_cursor_p->sn) {
if ((pdu_info_previous_cursor_p->so + pdu_info_previous_cursor_p->payload_size - 1) < pdu_info_p->so) { if ((pdu_info_previous_cursor_p->so + pdu_info_previous_cursor_p->payload_size - 1) < pdu_info_p->so) {
LOG_D(RLC, "[FRAME %05u][%s][RLC_AM][MOD %u/%u][RB %u][INSERT PDU] LINE %d RX PDU SN %04d SEGMENT OFFSET %05d (vr(mr) > vr(r) and sn >= vr(r))\n", LOG_D(RLC, "[FRAME %05u][%s][RLC_AM][MOD %u/%u][RB %u][INSERT PDU] LINE %d RX PDU SN %04d SEGMENT OFFSET %05d (vr(mr) > vr(r) and sn >= vr(r))\n",
......
...@@ -817,7 +817,7 @@ void rrc_eNB_send_S1AP_UE_CONTEXT_RELEASE_REQ (uint8_t mod_id, uint8_t ue_index, ...@@ -817,7 +817,7 @@ void rrc_eNB_send_S1AP_UE_CONTEXT_RELEASE_REQ (uint8_t mod_id, uint8_t ue_index,
if (ue_index == UE_INDEX_INVALID) { if (ue_index == UE_INDEX_INVALID) {
LOG_W(RRC, LOG_W(RRC,
"[eNB] In S1AP_UE_CONTEXT_RELEASE_COMMAND: invalid UE\n"); "[eNB] In S1AP_UE_CONTEXT_RELEASE_COMMAND: invalid UE\n");
return (-1); return;
} else { } else {
int e_rab; int e_rab;
int mod_id = 0; int mod_id = 0;
...@@ -829,7 +829,7 @@ void rrc_eNB_send_S1AP_UE_CONTEXT_RELEASE_REQ (uint8_t mod_id, uint8_t ue_index, ...@@ -829,7 +829,7 @@ void rrc_eNB_send_S1AP_UE_CONTEXT_RELEASE_REQ (uint8_t mod_id, uint8_t ue_index,
S1AP_UE_CONTEXT_RELEASE_REQ(msg_context_release_req_p).cause = causeP; S1AP_UE_CONTEXT_RELEASE_REQ(msg_context_release_req_p).cause = causeP;
S1AP_UE_CONTEXT_RELEASE_REQ(msg_context_release_req_p).cause_value = cause_valueP; S1AP_UE_CONTEXT_RELEASE_REQ(msg_context_release_req_p).cause_value = cause_valueP;
itti_send_msg_to_task(TASK_S1AP, mod_id, msg_context_release_req_p); itti_send_msg_to_task(TASK_S1AP, mod_id, msg_context_release_req_p);
return (0); return;
} }
} }
......
...@@ -128,10 +128,12 @@ char g_sid[MAX_SID]; ...@@ -128,10 +128,12 @@ char g_sid[MAX_SID];
int com_help (char * arg); int com_help (char * arg);
int com_exit (char *arg); int com_exit (char *arg);
int prompt(char *arg),prompt_usage(void), info(char *arg); int prompt(char *arg);
int prompt_usage(char *);
int info(char *arg);
int start(char *arg), set(char *arg); int start(char *arg), set(char *arg);
int start_usage(void), set_usage(void); int start_usage(char *), set_usage(void);
/* Forward declarations. */ /* Forward declarations. */
char *stripwhite (char *string); char *stripwhite (char *string);
......
...@@ -136,7 +136,7 @@ int start (char *arg) { ...@@ -136,7 +136,7 @@ int start (char *arg) {
return OK; return OK;
if (valid_argument ("start", arg) == ERR){ if (valid_argument ("start", arg) == ERR){
start_usage(); start_usage("");
return ERR; return ERR;
} }
...@@ -272,13 +272,13 @@ int process_argument(int optc, char* optv[]) { ...@@ -272,13 +272,13 @@ int process_argument(int optc, char* optv[]) {
} }
int prompt_usage(void) { int prompt_usage(char *arg) {
sprintf(buffer, "Usage: prompt [value]\n"); sprintf(buffer, "Usage: prompt [value]\n");
send(cli_cfg->cfd, buffer, strlen(buffer), 0); send(cli_cfg->cfd, buffer, strlen(buffer), 0);
return 0; return 0;
} }
int start_usage(void) { int start_usage(char *arg) {
sprintf(buffer, "Usage: start [enb|UE] [enb_index][0: stop, 1: start] \n"); sprintf(buffer, "Usage: start [enb|UE] [enb_index][0: stop, 1: start] \n");
send(cli_cfg->cfd, buffer, strlen(buffer), 0); send(cli_cfg->cfd, buffer, strlen(buffer), 0);
sprintf(buffer, "Example to start enb 0: start enb 0 1 \n"); sprintf(buffer, "Example to start enb 0: start enb 0 1 \n");
......
...@@ -182,7 +182,7 @@ int OCG_main(char is_local_server[FILENAME_LENGTH_MAX]) { ...@@ -182,7 +182,7 @@ int OCG_main(char is_local_server[FILENAME_LENGTH_MAX]) {
strcat(output_dir, file_date); strcat(output_dir, file_date);
strcat(output_dir, "/"); strcat(output_dir, "/");
strcpy(dst_dir, output_dir); strcpy(dst_dir, output_dir);
oai_emulation.info.output_path = &dst_dir; // information for other modules within OAI oai_emulation.info.output_path = dst_dir; // information for other modules within OAI
} else state = STATE_GENERATE_REPORT; } else state = STATE_GENERATE_REPORT;
break; break;
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include "mobility_parser.h" #include "mobility_parser.h"
#include "omg.h" #include "omg.h"
#include <math.h> #include <math.h>
#include "assertions.h"
extern hash_table_t **table; extern hash_table_t **table;
extern node_info **list_head; extern node_info **list_head;
...@@ -264,4 +265,6 @@ get_next_data (hash_table_t * table, int vid, int flag) ...@@ -264,4 +265,6 @@ get_next_data (hash_table_t * table, int vid, int flag)
} }
else else
return links; return links;
DevAssert(false); // FIXME return 0?
} }
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#define MIH_C_INTERFACE #define MIH_C_INTERFACE
#define MIH_C_F1_BASIC_DATA_TYPES_CODEC_C #define MIH_C_F1_BASIC_DATA_TYPES_CODEC_C
#include "MIH_C_F1_basic_data_types_codec.h" #include "MIH_C_F1_basic_data_types_codec.h"
#include <inttypes.h>
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
unsigned int MIH_C_BITMAP82String(MIH_C_BITMAP8_T* dataP, char* bufP) { unsigned int MIH_C_BITMAP82String(MIH_C_BITMAP8_T* dataP, char* bufP) {
...@@ -72,21 +73,21 @@ void MIH_C_BITMAP32_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP32_T* dataP) { ...@@ -72,21 +73,21 @@ void MIH_C_BITMAP32_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP32_T* dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void MIH_C_BITMAP64_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP64_T* dataP) { void MIH_C_BITMAP64_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP64_T* dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
printf("[MIH_C] %s: %16X\n", __FUNCTION__, *dataP); printf("[MIH_C] %s: %16"PRIX64"\n", __FUNCTION__, *dataP);
BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)(*dataP>>32)); BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)(*dataP>>32));
BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)*dataP); BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)*dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void MIH_C_BITMAP128_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP128_T* dataP) { void MIH_C_BITMAP128_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP128_T* dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
printf("[MIH_C] %s: %16X%16X\n", __FUNCTION__, dataP->val[0], dataP->val[1]); printf("[MIH_C] %s: %16"PRIX64"%16"PRIX64"\n", __FUNCTION__, dataP->val[0], dataP->val[1]);
MIH_C_BITMAP64_encode(bbP, &dataP->val[0]); MIH_C_BITMAP64_encode(bbP, &dataP->val[0]);
MIH_C_BITMAP64_encode(bbP, &dataP->val[1]); MIH_C_BITMAP64_encode(bbP, &dataP->val[1]);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void MIH_C_BITMAP256_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP256_T* dataP) { void MIH_C_BITMAP256_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP256_T* dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
printf("[MIH_C] %s: %16X%16X%16X%16X\n", __FUNCTION__, dataP->val[0], dataP->val[1], dataP->val[2], dataP->val[3]); printf("[MIH_C] %s: %16"PRIX64"%16"PRIX64"%16"PRIX64"%16"PRIX64"\n", __FUNCTION__, dataP->val[0], dataP->val[1], dataP->val[2], dataP->val[3]);
MIH_C_BITMAP64_encode(bbP, &dataP->val[0]); MIH_C_BITMAP64_encode(bbP, &dataP->val[0]);
MIH_C_BITMAP64_encode(bbP, &dataP->val[1]); MIH_C_BITMAP64_encode(bbP, &dataP->val[1]);
MIH_C_BITMAP64_encode(bbP, &dataP->val[2]); MIH_C_BITMAP64_encode(bbP, &dataP->val[2]);
......
...@@ -307,7 +307,7 @@ int eRAL_action_save_flow_id(ral_enb_instance_t instanceP, MIH_C_FLOW_ID_T* flow ...@@ -307,7 +307,7 @@ int eRAL_action_save_flow_id(ral_enb_instance_t instanceP, MIH_C_FLOW_ID_T* flow
** -1 if the list is full. ** ** -1 if the list is full. **
***************************************************************************/ ***************************************************************************/
int eRAL_action_set_channel_id (ral_enb_instance_t instanceP, MIH_C_FLOW_ID_T* flowId, int cnxid){ int eRAL_action_set_channel_id (ral_enb_instance_t instanceP, MIH_C_FLOW_ID_T* flowId, int cnxid){
char addr[128]; // char addr[128];
//char port[8]; //char port[8];
int f_ix; int f_ix;
...@@ -763,12 +763,12 @@ MIH_C_LINK_AC_RESULT_T eRAL_action_link_activate_resources(ral_enb_instance_t in ...@@ -763,12 +763,12 @@ MIH_C_LINK_AC_RESULT_T eRAL_action_link_activate_resources(ral_enb_instance_t in
/* Map QoS */ /* Map QoS */
int mapping_result = eRAL_process_map_qos(instanceP, mt_ix, ch_ix); int mapping_result = eRAL_process_map_qos(instanceP, mt_ix, ch_ix);
if (mapping_result) { if (mapping_result) {
int rc; int rc = -1;
#ifdef RAL_DUMMY #ifdef RAL_DUMMY
rc = eRAL_NAS_send_rb_establish_request(mt_ix, ch_ix); rc = eRAL_NAS_send_rb_establish_request(mt_ix, ch_ix);
#endif #endif
#ifdef RAL_REALTIME #ifdef RAL_REALTIME
// LG rc = RAL_process_NAS_message(IO_OBJ_RB, IO_CMD_ADD, mt_ix, ch_ix); // LG rc = RAL_process_NAS_message(IO_OBJ_RB, IO_CMD_ADD, mt_ix, ch_ix); // FIXME why is this commented?
#endif #endif
if (rc < 0) { if (rc < 0) {
/* Failed to send RB establishment request */ /* Failed to send RB establishment request */
...@@ -849,12 +849,12 @@ MIH_C_LINK_AC_RESULT_T eRAL_action_link_deactivate_resources(ral_enb_instance_t ...@@ -849,12 +849,12 @@ MIH_C_LINK_AC_RESULT_T eRAL_action_link_deactivate_resources(ral_enb_instance_t
* and go ahead in the request processing. */ * and go ahead in the request processing. */
(void) eRAL_action_del_channel_id(instanceP, f_ix); (void) eRAL_action_del_channel_id(instanceP, f_ix);
int rc; int rc = -1;
#ifdef RAL_DUMMY #ifdef RAL_DUMMY
rc = eRAL_NAS_send_rb_release_request(mt_ix, ch_ix); rc = eRAL_NAS_send_rb_release_request(mt_ix, ch_ix);
#endif #endif
#ifdef RAL_REALTIME #ifdef RAL_REALTIME
// LG rc = RAL_process_NAS_message(IO_OBJ_RB, IO_CMD_DEL, mt_ix, ch_ix); // LG rc = RAL_process_NAS_message(IO_OBJ_RB, IO_CMD_DEL, mt_ix, ch_ix); // FIXME why is this commented?
#endif #endif
if (rc < 0) { if (rc < 0) {
......
...@@ -145,7 +145,7 @@ char* eRAL_process_mt_addr_to_string(const unsigned char* ip_addr) ...@@ -145,7 +145,7 @@ char* eRAL_process_mt_addr_to_string(const unsigned char* ip_addr)
int i, index = 0; int i, index = 0;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
index += sprintf(&buffer[index], "%.2hX", ip_addr[i]); index += sprintf(&buffer[index], "%.2hhX", ip_addr[i]);
if (i % 2) buffer[index++] = ':'; if (i % 2) buffer[index++] = ':';
} }
buffer[--index] = '\0'; buffer[--index] = '\0';
......
...@@ -101,7 +101,7 @@ void eRAL_rx_rrc_ral_connection_establishment_indication(instance_t instanceP, M ...@@ -101,7 +101,7 @@ void eRAL_rx_rrc_ral_connection_establishment_indication(instance_t instanceP, M
void eRAL_rx_rrc_ral_connection_reestablishment_indication(instance_t instanceP, MessageDef *msg_pP) void eRAL_rx_rrc_ral_connection_reestablishment_indication(instance_t instanceP, MessageDef *msg_pP)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
{ {
module_id_t mod_id = instanceP; // module_id_t mod_id = instanceP;
#warning "TO DO ral_rx_rrc_ral_connection_reestablishment_indication" #warning "TO DO ral_rx_rrc_ral_connection_reestablishment_indication"
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
...@@ -146,14 +146,14 @@ void eRAL_rx_rrc_ral_connection_reconfiguration_indication(instance_t instanceP, ...@@ -146,14 +146,14 @@ void eRAL_rx_rrc_ral_connection_reconfiguration_indication(instance_t instanceP,
void eRAL_rx_rrc_ral_measurement_report_indication(instance_t instanceP, MessageDef *msg_pP) void eRAL_rx_rrc_ral_measurement_report_indication(instance_t instanceP, MessageDef *msg_pP)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
{ {
module_id_t mod_id = instanceP; // module_id_t mod_id = instanceP;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void eRAL_rx_rrc_ral_connection_release_indication(instance_t instanceP, MessageDef *msg_pP) void eRAL_rx_rrc_ral_connection_release_indication(instance_t instanceP, MessageDef *msg_pP)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
{ {
module_id_t mod_id = instanceP; // module_id_t mod_id = instanceP;
} }
......
...@@ -210,8 +210,8 @@ static void *UE_thread_synch(void *arg) { ...@@ -210,8 +210,8 @@ static void *UE_thread_synch(void *arg) {
sync_mode_t sync_mode = pss; sync_mode_t sync_mode = pss;
int card; int card;
int ind; int ind;
int CC_id; // int CC_id;
int k; // int k;
int found; int found;
UE->is_synchronized = 0; UE->is_synchronized = 0;
......
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