Updates

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4882 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair3/RAL-LTE/INTERFACE-802.21/C/MIH_C_F4_data_types_for_links_codec.c

@@ -454,10 +454,12 @@ unsigned int MIH_C_LINK_CFG_PARAM2String(MIH_C_LINK_CFG_PARAM_T *dataP, char* bu
             buffer_index += sprintf(&bufP[buffer_index], ", TIMER_INTERVAL=");
             buffer_index += MIH_C_TIMER_INTERVAL2String(&dataP->_union.timer_interval, &bufP[buffer_index]);
             break;
+#ifdef RAL_SAME_AS_MEDIEVAL_PROJECT_BUT_I_THINK_THIS_IS_AN_ERROR
         case 2:
             buffer_index += sprintf(&bufP[buffer_index], ", LINK_SCAN_RSP_LIST=");
             buffer_index += MIH_C_LINK_SCAN_RSP_LIST2String(&dataP->_union.link_scan_rsp_list, &bufP[buffer_index]);
             break;
+#endif
         default:
             buffer_index += sprintf(&bufP[buffer_index], ", CHOICE UNINITIALIZED");
     }
@@ -479,9 +481,11 @@ inline void MIH_C_LINK_CFG_PARAM_encode(Bit_Buffer_t* bbP, MIH_C_LINK_CFG_PARAM_
         case 1:
             MIH_C_TIMER_INTERVAL_encode(bbP, &dataP->_union.timer_interval);
             break;
+#ifdef RAL_SAME_AS_MEDIEVAL_PROJECT_BUT_I_THINK_THIS_IS_AN_ERROR
         case 2:
             MIH_C_LINK_SCAN_RSP_LIST_encode(bbP, &dataP->_union.link_scan_rsp_list);
             break;
+#endif
         default:
             printf("[MIH_C] ERROR NO KNOWN VALUE FOR ENCODING CHOICE OF MIH_C_LINK_CFG_PARAM_T %d\n", dataP->choice);
     }
@@ -499,9 +503,11 @@ inline void MIH_C_LINK_CFG_PARAM_decode(Bit_Buffer_t* bbP, MIH_C_LINK_CFG_PARAM_
         case 1:
             MIH_C_TIMER_INTERVAL_decode(bbP, &dataP->_union.timer_interval);
             break;
+#ifdef RAL_SAME_AS_MEDIEVAL_PROJECT_BUT_I_THINK_THIS_IS_AN_ERROR
         case 2:
             MIH_C_LINK_SCAN_RSP_LIST_decode(bbP, &dataP->_union.link_scan_rsp_list);
             break;
+#endif
         default:
             printf("[MIH_C] ERROR NO KNOWN VALUE FOR DECODING CHOICE OF MIH_C_LINK_CFG_PARAM_T %d\n", dataP->choice);
     }

openair3/RAL-LTE/INTERFACE-802.21/INCLUDE/MIH_C_Types.h

@@ -1656,7 +1656,9 @@ typedef struct MIH_C_LINK_CFG_PARAM {
     union  {
         MIH_C_NULL_T             null_attr;
         MIH_C_TIMER_INTERVAL_T   timer_interval;
+#ifdef RAL_SAME_AS_MEDIEVAL_PROJECT_BUT_I_THINK_THIS_IS_AN_ERROR
         LIST(MIH_C_LINK_SCAN_RSP, link_scan_rsp)
+#endif
     } _union;
     MIH_C_TH_ACTION_T             th_action;
     LIST(MIH_C_THRESHOLD, threshold)

openair3/RAL-LTE/LTE_RAL_UE/SRC/lteRALue_main.c

@@ -262,6 +262,7 @@ int mRAL_initialize(void) {
             hashtable_insert(g_ue_ral_fd2instance, g_ue_ral_obj[mod_id].mih_sock_desc, (void*)instance);
         }
         mRAL_send_link_register_indication(instance, &g_ue_ral_obj[mod_id].transaction_id);
+        g_ue_ral_obj[mod_id].transaction_id += 1;
     }
     return 0;
 }

openair3/RAL-LTE/LTE_RAL_UE/SRC/lteRALue_thresholds.c

@@ -40,6 +40,7 @@
 #include "assertions.h"
 #include "lteRALue.h"
 
+extern unsigned char NB_eNB_INST;
 
 
 /****************************************************************************
@@ -221,8 +222,75 @@ void mRAL_rx_rrc_ral_configure_threshold_conf(ral_ue_instance_t instance, Messag
     }
 }
 //---------------------------------------------------------------------------------------------------------------------
-void mRAL_rx_rrc_ral_measurement_report_indication(ral_ue_instance_t instance, MessageDef *msg_p)
+void mRAL_rx_rrc_ral_measurement_report_indication(ral_ue_instance_t instanceP, MessageDef *msg_p)
 //---------------------------------------------------------------------------------------------------------------------
 {
+    MIH_C_TRANSACTION_ID_T           transaction_id;
+    unsigned int                     mod_id;
+    MIH_C_LINK_TUPLE_ID_T            link_tuple_id;
+    LIST(MIH_C_LINK_PARAM_RPT,  link_parameters_report);
+
+    mod_id                               = instanceP - NB_eNB_INST;
+    transaction_id                       = g_ue_ral_obj[mod_id].transaction_id;
+    g_ue_ral_obj[mod_id].transaction_id += 1;
+
+    memset(&link_tuple_id, 0, sizeof(MIH_C_LINK_TUPLE_ID_T));
+    link_tuple_id.link_id.link_type     = MIH_C_WIRELESS_LTE;
+#ifdef USE_3GPP_ADDR_AS_LINK_ADDR
+    link_tuple_id.link_id.link_addr.choice = (MIH_C_CHOICE_T)MIH_C_CHOICE_3GPP_ADDR;
+    MIH_C_3GPP_ADDR_load_3gpp_str_address(instanceP, &link_tuple_id.link_id.link_addr._union._3gpp_addr, (u_int8_t*)DEFAULT_ADDRESS_3GPP);
+#else
+    link_tuple_id.link_id.link_addr.choice                          = MIH_C_CHOICE_3GPP_3G_CELL_ID;
+
+    // preserve byte order of plmn id
+    memcpy(link_tuple_id.link_id.link_addr._union._3gpp_3g_cell_id.plmn_id.val, &g_ue_ral_obj[mod_id].plmn_id, 3);
+    link_tuple_id.link_id.link_addr._union._3gpp_3g_cell_id.cell_id = g_ue_ral_obj[mod_id].cell_id;
+
+    LOG_D(RAL_UE, "PLMN ID %d.%d.%d\n", link_tuple_id.link_id.link_addr._union._3gpp_3g_cell_id.plmn_id.val[0],
+            ink_tuple_id.link_id.link_addr._union._3gpp_3g_cell_id.plmn_id.val[1],
+            link_tuple_id.link_id.link_addr._union._3gpp_3g_cell_id.plmn_id.val[2]);
+    LOG_D(RAL_UE, "CELL ID %d\n", link_tuple_id.link_id.link_addr._union._3gpp_3g_cell_id.cell_id);
+#endif
+
+    MIH_C_LINK_PARAM_RPT_LIST_init(&link_parameters_report_list);
+    memcpy(&link_parameters_report_list.val[0].link_param,
+            &RRC_RAL_MEASUREMENT_REPORT_IND(msg_p).link_param,
+            sizeof(MIH_C_LINK_PARAM_T));
+
+    if (RRC_RAL_MEASUREMENT_REPORT_IND(msg_p).threshold.threshold_xdir == RAL_NO_THRESHOLD) {
+        link_parameters_report_list.val[0].choice = MIH_C_LINK_PARAM_RPT_CHOICE_NULL;
+    } else {
+        link_parameters_report_list.val[0].choice = MIH_C_LINK_PARAM_RPT_CHOICE_THRESHOLD;
+        link_parameters_report_list.val[0]._union.threshold.threshold_val  = RRC_RAL_MEASUREMENT_REPORT_IND(msg_p).threshold.threshold_val;
+        link_parameters_report_list.val[0]._union.threshold.threshold_xdir = RRC_RAL_MEASUREMENT_REPORT_IND(msg_p).threshold.threshold_xdir;
+    }
+    link_parameters_report_list.length += 1;
 
+    mRAL_send_link_parameters_report_indication(instanceP,
+                                               &transaction_id,
+                                               &link_tuple_id,
+                                               &link_parameters_report_list);
 }
+/*
+ * typedef struct MIH_C_LINK_PARAM {
+    MIH_C_LINK_PARAM_TYPE_T      link_param_type;
+    MIH_C_CHOICE_T               choice;
+    union  {
+        MIH_C_LINK_PARAM_VAL_T   link_param_val;
+        MIH_C_QOS_PARAM_VAL_T    qos_param_val;
+    } _union;
+} MIH_C_LINK_PARAM_T;
+
+ * typedef struct MIH_C_LINK_PARAM_RPT {
+    MIH_C_LINK_PARAM_T           link_param;
+    MIH_C_CHOICE_T               choice;
+    union  {
+        MIH_C_NULL_T             null_attr;
+        MIH_C_THRESHOLD_T        threshold;
+    } _union;
+} MIH_C_LINK_PARAM_RPT_T;
+#define MIH_C_LINK_PARAM_RPT_CHOICE_NULL      0
+#define MIH_C_LINK_PARAM_RPT_CHOICE_THRESHOLD 1
+ *
+ */
+