Update

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

openair3/RAL-LTE/LTE_RAL_UE/INCLUDE/lteRALue_constants.h

@@ -37,13 +37,13 @@
 #ifndef __LTERALUE_CONSTANTS_H__
 #define __LTERALUE_CONSTANTS_H__
 //-----------------------------------------------------------------------------
-#define UE_DEFAULT_LOCAL_PORT_RAL    "1335"
-#define UE_DEFAULT_REMOTE_PORT_MIHF  "1125"
+#define UE_DEFAULT_LOCAL_PORT_RAL    "1234"
+#define UE_DEFAULT_REMOTE_PORT_MIHF  "1025"
 #define UE_DEFAULT_IP_ADDRESS_MIHF   "127.0.0.1"
 #define UE_DEFAULT_IP_ADDRESS_RAL    "127.0.0.1"
 #define UE_DEFAULT_LINK_ID_RAL       "ue_lte_link"
 #define UE_DEFAULT_LINK_ADDRESS_RAL  "060080149150"
-#define UE_DEFAULT_MIHF_ID           "mihf_ue"
+#define UE_DEFAULT_MIHF_ID           "mihf2_ue"
 #define DEFAULT_ADDRESS_3GPP      "0335060080149150"
 #define DEFAULT_ADDRESS_eNB       "0000000000000001"
 

openair3/RAL-LTE/LTE_RAL_UE/INCLUDE/lteRALue_main.h

@@ -104,9 +104,10 @@ typedef struct lte_ral_ue_object_s {
 
  // network parameters
     u16     cell_id;
-    u16 nas_state;
+    plmn_t  plmn_id;
+    //u16 nas_state;
     int state;
-    u32 curr_signal_level;
+    //u32 curr_signal_level;
     u32 ipv6_l2id[2];
  //measures
     u8  req_num_bs;

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

@@ -225,8 +225,8 @@ int mRAL_initialize(void) {
                                                   MIH_C_BIT_LINK_HANDOVER_COMPLETE |
                                                   MIH_C_BIT_LINK_PDU_TRANSMIT_STATUS;
 
-        g_ue_ral_obj[instance].mih_supported_link_command_list = MIH_C_BIT_LINK_EVENT_SUBSCRIBE | MIH_C_BIT_LINK_EVENT_UNSUBSCRIBE | \
-                                                  MIH_C_BIT_LINK_GET_PARAMETERS  | MIH_C_BIT_LINK_CONFIGURE_THRESHOLDS | \
+        g_ue_ral_obj[instance].mih_supported_link_command_list = MIH_C_BIT_LINK_EVENT_SUBSCRIBE | MIH_C_BIT_LINK_EVENT_UNSUBSCRIBE |
+                                                  MIH_C_BIT_LINK_GET_PARAMETERS  | MIH_C_BIT_LINK_CONFIGURE_THRESHOLDS |
                                                   MIH_C_BIT_LINK_ACTION;
 
         g_ue_ral_obj[instance].link_to_be_detected = MIH_C_BOOLEAN_TRUE;
@@ -325,6 +325,11 @@ void* mRAL_task(void *args_p) {
                     mRAL_rx_rrc_ral_connection_reconfiguration_indication(instance, msg_p);
                     break;
 
+                case RRC_RAL_CONNECTION_RECONFIGURATION_HO_IND:
+                    LOG_D(RAL_UE, "Received %s\n", msg_name);
+                    //mRAL_rx_rrc_ral_connection_reconfiguration_ho_indication(instance, msg_p);
+                    break;
+
                 case RRC_RAL_MEASUREMENT_REPORT_IND:
                     LOG_D(RAL_UE, "Received %s\n", msg_name);
                     mRAL_rx_rrc_ral_measurement_report_indication(instance, msg_p);
@@ -343,7 +348,7 @@ void* mRAL_task(void *args_p) {
                     LOG_E(RAL_UE, "Received unexpected message %s\n", msg_name);
                     break;
             }
-            free(msg_p);
+            itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
             msg_p = NULL;
         }
         nb_events = itti_get_events(TASK_RAL_UE, &events);

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

@@ -212,7 +212,7 @@ void mRAL_send_link_register_indication(ral_ue_instance_t        instanceP,
     MIH_C_MIHF_ID_set(&message.destination, (u_int8_t*)g_ue_ral_obj[instanceP].mihf_id, strlen(g_ue_ral_obj[instanceP].mihf_id));
 
 
-    message.primitive.Link_Id.link_type        = MIH_C_WIRELESS_UMTS;
+    message.primitive.Link_Id.link_type        = MIH_C_WIRELESS_LTE; //MIH_C_WIRELESS_UMTS;
     message.primitive.Link_Id.link_addr.choice = (MIH_C_CHOICE_T)MIH_C_CHOICE_3GPP_ADDR;
 
     MIH_C_3GPP_ADDR_set(&message.primitive.Link_Id.link_addr._union._3gpp_addr, (u_int8_t*)&(g_ue_ral_obj[instanceP].ipv6_l2id[0]), strlen(DEFAULT_ADDRESS_3GPP));
@@ -228,8 +228,10 @@ void mRAL_send_link_register_indication(ral_ue_instance_t        instanceP,
     #endif
 
     if (mRAL_send_to_mih(instanceP, bb->m_buffer,message_total_length)<0){
+        printf("ERROR RAL_UE, : Send Link_Register.indication\n");
         LOG_E(RAL_UE, ": Send Link_Register.indication\n");
     } else {
+        printf("OK RAL_UE, : Send Link_Register.indication\n");
         LOG_D(RAL_UE, ": Sent Link_Register.indication\n");
     }
     free_BitBuffer(bb);