Add 802.21 in oaisim exe, work in progress.

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

common/utils/Makefile.inc

@@ -6,7 +6,14 @@ ITTI_OBJS += $(ITTI_DIR)/backtrace.o
 ITTI_OBJS += $(ITTI_DIR)/signals.o
 ITTI_OBJS += $(ITTI_DIR)/timer.o
 
-UTILS_OBJS = $(ITTI_OBJS)
+
+HASHTABLE_DIR = $(COMMON_UTILS_DIR)/collection/hashtable
+
+HASHTABLE_OBJS =  $(HASHTABLE_DIR)/hashtable.o
+HASHTABLE_OBJS += $(HASHTABLE_DIR)/obj_hashtable.o
+
+
+UTILS_OBJS = $(ITTI_OBJS) $(HASHTABLE_OBJS)
 
 UTILS_incl = 				\
 	-I$(COMMON_UTILS_DIR) 	\

openair2/COMMON/messages_def.h

@@ -9,3 +9,5 @@
 #include "s1ap_messages_def.h"
 #include "sctp_messages_def.h"
 #include "x2ap_messages_def.h"
+#include "ral_messages_def.h"
+

openair2/COMMON/messages_types.h

@@ -16,5 +16,6 @@
 #include "s1ap_messages_types.h"
 #include "sctp_messages_types.h"
 #include "x2ap_messages_types.h"
+#include "ral_messages_types.h"
 
 #endif /* MESSAGES_TYPES_H_ */

openair2/COMMON/ral_messages_def.h

+MESSAGE_DEF(RRC_RAL_SYSTEM_CONFIGURATION_IND,       MESSAGE_PRIORITY_MED, rrc_ral_system_configuration_ind_t,       rrc_ral_system_configuration_ind)
+MESSAGE_DEF(RRC_RAL_SYSTEM_INFORMATION_IND,         MESSAGE_PRIORITY_MED, rrc_ral_system_information_ind_t,         rrc_ral_system_information_ind)
+
+MESSAGE_DEF(RRC_RAL_SCAN_REQ,                       MESSAGE_PRIORITY_MED, rrc_ral_scan_req_t,                       rrc_ral_scan_req)
+MESSAGE_DEF(RRC_RAL_SCAN_CONF,                      MESSAGE_PRIORITY_MED, rrc_ral_scan_conf_t,                      rrc_ral_scan_conf)
+
+MESSAGE_DEF(RRC_RAL_CONFIGURE_THRESHOLD_REQ,        MESSAGE_PRIORITY_MAX, rrc_ral_configure_threshold_req_t,        rrc_ral_configure_threshold_req)
+MESSAGE_DEF(RRC_RAL_CONFIGURE_THRESHOLD_CONF,       MESSAGE_PRIORITY_MED, rrc_ral_configure_threshold_conf_t,       rrc_ral_configure_threshold_conf)
+MESSAGE_DEF(RRC_RAL_MEASUREMENT_REPORT_IND,         MESSAGE_PRIORITY_MAX, rrc_ral_measurement_report_ind_t,         rrc_ral_measurement_report_ind)
+
+MESSAGE_DEF(RRC_RAL_CONNECTION_ESTABLISHMENT_REQ,   MESSAGE_PRIORITY_MED, rrc_ral_connection_establishment_req_t,   rrc_ral_connection_establishment_req)
+MESSAGE_DEF(RRC_RAL_CONNECTION_ESTABLISHMENT_CONF,  MESSAGE_PRIORITY_MED, rrc_ral_connection_establishment_conf_t,  rrc_ral_connection_establishment_conf)
+MESSAGE_DEF(RRC_RAL_CONNECTION_ESTABLISHMENT_IND,   MESSAGE_PRIORITY_MED, rrc_ral_connection_establishment_ind_t,   rrc_ral_connection_establishment_ind)
+MESSAGE_DEF(RRC_RAL_CONNECTION_REESTABLISHMENT_IND, MESSAGE_PRIORITY_MED, rrc_ral_connection_reestablishment_ind_t, rrc_ral_connection_reestablishment_ind)
+MESSAGE_DEF(RRC_RAL_CONNECTION_RECONFIGURATION_IND, MESSAGE_PRIORITY_MAX, rrc_ral_connection_reconfiguration_ind_t, rrc_ral_connection_reconfiguration_ind)
+
+MESSAGE_DEF(RRC_RAL_CONNECTION_RELEASE_REQ,         MESSAGE_PRIORITY_MED, rrc_ral_connection_release_req_t,         rrc_ral_connection_release_req)
+MESSAGE_DEF(RRC_RAL_CONNECTION_RELEASE_CONF,        MESSAGE_PRIORITY_MED, rrc_ral_connection_release_conf_t,        rrc_ral_connection_release_conf)
+MESSAGE_DEF(RRC_RAL_CONNECTION_RELEASE_IND,         MESSAGE_PRIORITY_MED, rrc_ral_connection_release_ind_t,         rrc_ral_connection_release_ind)
+

openair2/COMMON/tasks_def.h

@@ -20,6 +20,9 @@ SUB_TASK_DEF(TASK_L2L1,     TASK_PDCP_ENB,              200)
     ///   Radio Resource Control task
     TASK_DEF(TASK_RRC_ENB,  TASK_PRIORITY_MED,          200)
     ///   S1ap task
+/// RAL task for ENB
+TASK_DEF(TASK_RAL_ENB, TASK_PRIORITY_MED, 200)
+
     TASK_DEF(TASK_S1AP,     TASK_PRIORITY_MED,          200)
     ///   X2ap task, acts as both source and target
     TASK_DEF(TASK_X2AP,     TASK_PRIORITY_MED,          200)
@@ -39,4 +42,5 @@ SUB_TASK_DEF(TASK_L2L1,     TASK_PDCP_UE,               200)
     TASK_DEF(TASK_RRC_UE,   TASK_PRIORITY_MED,          200)
     ///   Non Access Stratum task
     TASK_DEF(TASK_NAS_UE,   TASK_PRIORITY_MED,          200)
+    TASK_DEF(TASK_RAL_UE,   TASK_PRIORITY_MED,          200)
 

openair2/LAYER2/PDCP_v10.1.0/pdcp.h

@@ -361,15 +361,21 @@ protected_pdcp_fifo(void pdcp_fifo_read_input_sdus_from_otg (u32_t frame, u8_t e
 /*
  * Following two types are utilized between NAS driver and PDCP
  */
-typedef struct pdcp_data_req_header_t {
+
+typedef int traffic_type_t;
+
+typedef struct pdcp_data_req_header_s {
   rb_id_t             rb_id;
-  sdu_size_t           data_size;
-  int       inst;
+  sdu_size_t          data_size;
+  int                 inst;
+  traffic_type_t      traffic_type;
 } pdcp_data_req_header_t;
-typedef struct pdcp_data_ind_header_t {
+
+typedef struct pdcp_data_ind_header_s {
   rb_id_t             rb_id;
-  sdu_size_t           data_size;
-  int       inst;
+  sdu_size_t          data_size;
+  int                 inst;
+  int                 dummy;
 } pdcp_data_ind_header_t;
 
 struct pdcp_netlink_element_s {

openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c

@@ -60,6 +60,7 @@ extern int otg_enabled;
 
 #include "../MAC/extern.h"
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
+#include "NAS/DRIVER/LITE/constant.h"
 #include "SIMULATION/ETH_TRANSPORT/extern.h"
 #include "UTIL/OCG/OCG.h"
 #include "UTIL/OCG/OCG_extern.h"
@@ -312,6 +313,22 @@ int
                          pdcp_input_sdu_buffer,
                          PDCP_DATA_PDU);
             }
+
+        } else if ((pdcp_input_header.traffic_type == OAI_NW_DRV_IPV6_ADDR_TYPE_MULTICAST) || (pdcp_input_header.traffic_type == OAI_NW_DRV_IPV4_ADDR_TYPE_MULTICAST)) {
+            printf("[MSC_MSG][FRAME %05d][IP][MOD %02d][][--- PDCP_DATA_REQ on MBMS bearer/ %d Bytes --->][PDCP][MOD %02d][RB %02d]\n",
+                  frame, pdcp_read_header.inst,  pdcp_read_header.data_size, pdcp_read_header.inst, pdcp_read_header.rb_id);
+
+            if (pdcp_array[pdcp_read_header.inst][pdcp_read_header.rb_id%NB_RB_MAX].instanciated_instance) {
+                pdcp_data_req (pdcp_input_header.inst,
+                         frame, eNB_flag,
+                         pdcp_input_header.rb_id,
+                         RLC_MUI_UNDEFINED,
+                         RLC_SDU_CONFIRM_NO,
+                         pdcp_input_header.data_size,
+                         pdcp_input_sdu_buffer,
+                         PDCP_TM);
+            }
+
         } else if (eNB_flag) {
             // is a broadcast packet, we have to send this packet on all default RABS of all connected UEs
             LOG_D(PDCP, "Checking if could sent on default rabs\n");
@@ -537,12 +554,10 @@ int pdcp_fifo_read_input_sdus (u32_t frame, u8_t eNB_flag, u8_t UE_index, u8_t e
     while (pdcp_netlink_dequeue_element(eNB_flag, UE_index, eNB_index, &data) != 0) {
         if (data->pdcp_read_header.rb_id != 0) {
             if (pdcp_array[data->pdcp_read_header.inst][data->pdcp_read_header.rb_id%NB_RB_MAX].instanciated_instance) {
-#ifdef PDCP_DEBUG
-                LOG_D(PDCP, "[MSC_MSG][FRAME %05d][IP][MOD %02d][][--- PDCP_DATA_REQ "
+                LOG_D(PDCP, "[FRAME %05d][IP][MOD %02d][][--- PDCP_DATA_REQ "
                       "/ %d Bytes --->][PDCP][MOD %02d][RB %02d]\n",
                       frame, data->pdcp_read_header.inst, data->pdcp_read_header.data_size,
                       data->pdcp_read_header.inst, data->pdcp_read_header.rb_id);
-#endif
 
                 pdcp_data_req(data->pdcp_read_header.inst,
                               frame,

openair2/Makefile

@@ -134,6 +134,12 @@ nasmesh_netlink.ko:
 naslite_netlink_ether.ko:
 	(cd NAS/DRIVER/LITE && $(MAKE) -j$(NUM_CORES) $(SET_UM) OAI_NW_DRIVER_TYPE_ETHERNET=1 NAS_NETLINK=1 OAI_NW_DRIVER_USE_NETLINK=1 V=1 -C /usr/src/$(LINUX_KERNEL) M=`pwd` modules)
 
+oai_nw_ether.ko:
+	(cd NAS/DRIVER/LITE && $(MAKE) -j$(NUM_CORES) $(SET_UM) OAI_NW_DRIVER_TYPE_ETHERNET=1 NAS_NETLINK=1 OAI_NW_DRIVER_USE_NETLINK=1 V=1 -C /usr/src/$(LINUX_KERNEL) M=`pwd` modules)
+
+oai_nw_drv.ko:
+	(cd NAS/DRIVER/LITE && $(MAKE) -j$(NUM_CORES) $(SET_UM) OAI_NW_DRIVER_TYPE_ETHERNET=1 NAS_NETLINK=1 OAI_NW_DRIVER_USE_NETLINK=1 V=1 -C /usr/src/$(LINUX_KERNEL) M=`pwd` modules)
+
 nasmesh_netlink_address_fix.ko:
 	(cd NAS/DRIVER/MESH && $(MAKE) -j$(NUM_CORES) $(SET_UM) NAS_NETLINK=1 ADDRESS_FIX=1 V=1 -C /usr/src/$(LINUX_KERNEL) M=`pwd` modules)
 

openair2/NAS/DRIVER/LITE/Makefile

@@ -92,7 +92,7 @@ obj-m += oai_nw_drv.o
 oai_nw_drv-objs += device.o
 oai_nw_drv-objs += common.o
 oai_nw_drv-objs += ioctl.o
-#oai_nw_drv-objs += classifier.o
+oai_nw_drv-objs += classifier.o
 oai_nw_drv-objs += tool.o
 ifdef OAI_NW_DRIVER_USE_NETLINK
 oai_nw_drv-objs += netlink.o

openair2/NAS/DRIVER/LITE/classifier.c

@@ -148,168 +148,59 @@
          && ((((__const uint8_t *) (a))[3] & (((__const uint8_t *) (m))[3])) == (((__const uint8_t *) (b))[3] & (((__const uint8_t *) (m))[3]))))
 
 
-//#define OAI_DRV_DEBUG_CLASS
-//#define OAI_DRV_DEBUG_SEND
 //---------------------------------------------------------------------------
-void oai_nw_drv_create_mask_ipv6_addr(struct in6_addr *masked_addrP, int prefix_len){
+// Find the IP traffic type (UNICAST, MULTICAST, BROADCAST)
+traffic_type_t oai_nw_drv_find_traffic_type(struct sk_buff  *skb) {
   //---------------------------------------------------------------------------
-  int   u6_addr8_index;
-  int   u6_addr1_index;
-  int   index;
-
-  masked_addrP->s6_addr32[0] = 0xFFFFFFFF;
-  masked_addrP->s6_addr32[1] = 0xFFFFFFFF;
-  masked_addrP->s6_addr32[2] = 0xFFFFFFFF;
-  masked_addrP->s6_addr32[3] = 0xFFFFFFFF;
-
-  switch (prefix_len) {
-  case 128:
-	  return;
-  case 112:
-	  masked_addrP->s6_addr32[3] = htonl(0xFFFF0000);
-	  return;
-  case 96:
-	  masked_addrP->s6_addr32[3] = 0x00000000;
-	  return;
-  case 80:
-	  masked_addrP->s6_addr32[2] = htonl(0xFFFF0000);
-	  masked_addrP->s6_addr32[3] = 0x00000000;
-	  return;
-  case 64:
-	  masked_addrP->s6_addr32[2] = 0x00000000;
-	  masked_addrP->s6_addr32[3] = 0x00000000;
-	  return;
-  case 48:
-	  masked_addrP->s6_addr32[1] = htonl(0xFFFF0000);
-	  masked_addrP->s6_addr32[2] = 0x00000000;
-	  masked_addrP->s6_addr32[3] = 0x00000000;
-	  return;
-  case 32:
-	  masked_addrP->s6_addr32[1] = 0x00000000;
-	  masked_addrP->s6_addr32[2] = 0x00000000;
-	  masked_addrP->s6_addr32[3] = 0x00000000;
-	  return;
-  case 16:
-	  masked_addrP->s6_addr32[0] = htonl(0xFFFF0000);
-	  masked_addrP->s6_addr32[1] = 0x00000000;
-	  masked_addrP->s6_addr32[2] = 0x00000000;
-	  masked_addrP->s6_addr32[3] = 0x00000000;
-	  return;
-  default:
-      u6_addr8_index = prefix_len >> 3;
-      u6_addr1_index = prefix_len & 0x07;
-
-      for (index = u6_addr8_index ; index < 16; index++) {
-          masked_addrP->s6_addr[index] = 0;
-      }
-      if (u6_addr1_index > 0) {
-          masked_addrP->s6_addr[u6_addr8_index+1] = htons(0xFF << (8-u6_addr1_index));
-      }
-      for (index = 0 ; index < 4; index++) {
-    	  masked_addrP->s6_addr32[index] = htonl(masked_addrP->s6_addr32[index]);
-      }
-  }
-
-}
-//---------------------------------------------------------------------------
-void oai_nw_drv_create_mask_ipv4_addr(struct in_addr *masked_addrP, int prefix_len){
-  //---------------------------------------------------------------------------
-  if (prefix_len > 32) {
-      prefix_len = 32;
-  }
-  masked_addrP->s_addr = htonl(0xFFFFFFFF << (32 - prefix_len));
-  return;
-}
-
-
-//---------------------------------------------------------------------------
-// Search the entity with the IPv6 address 'addr'
-// Navid: the ipv6 classifier is not fully tested
-struct cx_entity *oai_nw_drv_find_cx6(struct sk_buff  *skb,
-                                unsigned char    dscp,
-                                struct oai_nw_drv_priv *gpriv,
-                                int              inst,
-                                int             *paddr_type,
-                                unsigned char   *cx_searcher) {
-  //---------------------------------------------------------------------------
-  unsigned char             cxi;
-  struct cx_entity         *cx = NULL;
-  struct classifier_entity *sclassifier= NULL;
-  u32                       mc_addr_hdr;
-  struct in6_addr           masked_addr;
+  traffic_type_t            traffic_type = OAI_NW_DRV_IPVX_ADDR_TYPE_UNKNOWN;
 
   if (skb!=NULL) {
+    switch (ntohs(skb->protocol))  {
+    case ETH_P_IPV6:
+      traffic_type = OAI_NW_DRV_IPV6_ADDR_TYPE_UNKNOWN;
       #ifdef OAI_DRV_DEBUG_CLASS
       printk("SOURCE ADDR %X:%X:%X:%X:%X:%X:%X:%X",NIP6ADDR(&(ipv6_hdr(skb)->saddr)));
       printk("    DEST   ADDR %X:%X:%X:%X:%X:%X:%X:%X\n",NIP6ADDR(&(ipv6_hdr(skb)->daddr)));
       #endif
-      mc_addr_hdr = ntohl(ipv6_hdr(skb)->daddr.in6_u.u6_addr32[0]);
-      //printk("   mc_addr_hdr  %08X\n",mc_addr_hdr);
-      // First check if multicast [1st octet is FF]
-      if ((mc_addr_hdr & 0xFF000000) == 0xFF000000) {
-          // packet type according to the scope of the multicast packet
-          // we don't consider RPT bits in second octet [maybe done later if needed]
-          switch(mc_addr_hdr & 0x000F0000) {
-              case (0x00020000):
-                  *paddr_type = OAI_NW_DRV_IPV6_ADDR_TYPE_MC_SIGNALLING;
-                  #ifdef OAI_DRV_DEBUG_CLASS
-                  printk("nasrg_CLASS_cx6: multicast packet - signalling \n");
-                  #endif
-                  break;
-              case (0x000E0000):
-                  *paddr_type = OAI_NW_DRV_IPV6_ADDR_TYPE_MC_MBMS;
-                  //*pmbms_ix = 0;
-                  //cx=gpriv->cx;  // MBMS associate to Mobile 0
-                  #ifdef OAI_DRV_DEBUG_CLASS
-                  printk("nasrg_CLASS_cx6: multicast packet - MBMS data \n");
-                  #endif
-                  break;
-          default:
-                  printk("nasrg_CLASS_cx6: default \n");
-                  *paddr_type = OAI_NW_DRV_IPV6_ADDR_TYPE_UNKNOWN;
-                  //*pmbms_ix = NASRG_MBMS_SVCES_MAX;
-          }
+      if (IN6_IS_ADDR_MULTICAST(&ipv6_hdr(skb)->daddr.in6_u.u6_addr32[0])) {
+          traffic_type = OAI_NW_DRV_IPV6_ADDR_TYPE_MULTICAST;
+
       } else {
-          *paddr_type = OAI_NW_DRV_IPV6_ADDR_TYPE_UNICAST;
-
-          for (cxi=*cx_searcher; cxi<OAI_NW_DRV_CX_MAX; cxi++) {
-
-              (*cx_searcher)++;
-              sclassifier = gpriv->cx[cxi].sclassifier[dscp];
-
-              while (sclassifier!=NULL) {
-                  if ((sclassifier->ip_version == OAI_NW_DRV_IP_VERSION_6) || (sclassifier->ip_version == OAI_NW_DRV_IP_VERSION_ALL)) {   // verify that this is an IPv6 rule
-                      /*LGif (IN6_IS_ADDR_UNSPECIFIED(&(sclassifier->daddr.ipv6))) {
-                          printk("oai_nw_drv_find_cx6: addr is null \n");
-                          sclassifier = sclassifier->next;
-                          continue;
-                      }*/
-                      #ifdef OAI_DRV_DEBUG_CLASS
-                      printk("cx %d : DSCP %d %X:%X:%X:%X:%X:%X:%X:%X\n",cxi, dscp, NIP6ADDR(&(sclassifier->daddr.ipv6)));
-                      #endif //OAI_DRV_DEBUG_CLASS
-                      //if ((dst = (unsigned int*)&(((struct rt6_info *)skbdst)->rt6i_gateway)) == 0){
-                      // LG: STRANGE
-                      if (IN6_IS_ADDR_UNSPECIFIED(&ipv6_hdr(skb)->daddr)) {
-                          printk("oai_nw_drv_find_cx6: dst addr is null \n");
-                          sclassifier = sclassifier->next;
-                          continue;
-                      }
-
-                      oai_nw_drv_create_mask_ipv6_addr(&masked_addr, sclassifier->dplen);
-                      if (IN6_ARE_ADDR_MASKED_EQUAL(&ipv6_hdr(skb)->daddr, &(sclassifier->daddr.ipv6), &masked_addr)) {
-                              #ifdef OAI_DRV_DEBUG_CLASS
-                              printk("oai_nw_drv_find_cx6: found cx %d: %X:%X:%X:%X:%X:%X:%X:%X\n",cxi, NIP6ADDR(&(sclassifier->daddr.ipv6)));
-                              #endif //OAI_DRV_DEBUG_CLASS
-                              return &gpriv->cx[cxi];
-                      }
-                  }
-                  // Go to next classifier entry for connection
-                  sclassifier = sclassifier->next;
-              }
-          }
+          traffic_type = OAI_NW_DRV_IPV6_ADDR_TYPE_UNICAST;
       }
+      
+      break;
+      
+      
+    case ETH_P_IP:
+      traffic_type = OAI_NW_DRV_IPV4_ADDR_TYPE_UNKNOWN;
+#ifdef KERNEL_VERSION_GREATER_THAN_2622
+      //print_TOOL_pk_ipv4((struct iphdr *)skb->network_header);
+      if (IN_MULTICAST(htonl(ip_hdr(skb)->daddr))) {
+          traffic_type = OAI_NW_DRV_IPV4_ADDR_TYPE_MULTICAST;
+      } else {
+          traffic_type = OAI_NW_DRV_IPV4_ADDR_TYPE_UNICAST;
+      }
+      // TO DO BROADCAST
+      
+#else
+      //print_TOOL_pk_ipv4(skb->nh.iph);
+      if (IN_MULTICAST(htonl(ip_hdr(skb)->daddr))) {
+          traffic_type = OAI_NW_DRV_IPV4_ADDR_TYPE_MULTICAST;
+      } else {
+          traffic_type = OAI_NW_DRV_IPV4_ADDR_TYPE_UNICAST;
+      }
+      // TO DO BROADCAST
+#endif
+      break;
+      
+      case ETH_P_ARP:
+          traffic_type = OAI_NW_DRV_IPV4_ADDR_TYPE_BROADCAST;
+	  break;
+      
+    default:;
+    }
   }
-  printk("oai_nw_drv_find_cx6 NOT FOUND: %X:%X:%X:%X:%X:%X:%X:%X\n",NIP6ADDR(&ipv6_hdr(skb)->daddr));
-  return cx;
+  return traffic_type;
 }
 

openair2/NAS/DRIVER/LITE/common.c

@@ -68,8 +68,8 @@
         ntohs((addr)->s6_addr16[7])
 
 
-//#define OAI_DRV_DEBUG_SEND
-//#define OAI_DRV_DEBUG_RECEIVE
+#define OAI_DRV_DEBUG_SEND
+#define OAI_DRV_DEBUG_RECEIVE
 void oai_nw_drv_common_class_wireless2ip(u16 dlen,
                         void *pdcp_sdu,
                         int inst,
@@ -329,7 +329,7 @@ void oai_nw_drv_common_ip2wireless_drop(struct sk_buff *skb, int inst){
 // Request the transfer of data (QoS SAP)
 void oai_nw_drv_common_ip2wireless(struct sk_buff *skb, int inst){
   //---------------------------------------------------------------------------
-  struct pdcp_data_req_header_t     pdcph;
+  struct pdcp_data_req_header_s     pdcph;
   struct oai_nw_drv_priv *priv=netdev_priv(oai_nw_drv_dev[inst]);
 #ifdef LOOPBACK_TEST
   int i;
@@ -350,9 +350,11 @@ void oai_nw_drv_common_ip2wireless(struct sk_buff *skb, int inst){
     return;
   }
 
-  pdcph.data_size  = skb->len;
-  pdcph.rb_id      = skb->mark;
-  pdcph.inst       = inst;
+  pdcph.data_size    = skb->len;
+  pdcph.rb_id        = skb->mark;
+  pdcph.inst         = inst;
+  pdcph.traffic_type = oai_nw_drv_find_traffic_type(skb);
+
 
   bytes_wrote = oai_nw_drv_netlink_send((char *)&pdcph,OAI_NW_DRV_PDCPH_SIZE);
 #ifdef OAI_DRV_DEBUG_SEND
@@ -386,7 +388,7 @@ void oai_nw_drv_common_ip2wireless(struct sk_buff *skb, int inst){
       return;
     }
 #ifdef OAI_DRV_DEBUG_SEND
-  printk("[OAI_IP_DRV][%s] Sending packet of size %d to PDCP \n",__FUNCTION__,skb->len);
+  printk("[OAI_IP_DRV][%s] Sending packet of size %d to PDCP traffic type %d\n",__FUNCTION__,skb->len, pdcph.traffic_type);
 
  for (j=0;j<skb->len;j++)
     printk("%2x ",((unsigned char *)(skb->data))[j]);
@@ -405,7 +407,7 @@ void oai_nw_drv_common_ip2wireless(struct sk_buff *skb, int inst){
 void oai_nw_drv_common_wireless2ip(struct nlmsghdr *nlh) {
 //---------------------------------------------------------------------------
 
-  struct pdcp_data_ind_header_t     *pdcph = (struct pdcp_data_ind_header_t *)NLMSG_DATA(nlh);
+  struct pdcp_data_ind_header_s     *pdcph = (struct pdcp_data_ind_header_s *)NLMSG_DATA(nlh);
   struct oai_nw_drv_priv *priv;
 
   priv = netdev_priv(oai_nw_drv_dev[pdcph->inst]);

openair2/NAS/DRIVER/LITE/constant.h

@@ -36,8 +36,8 @@
 
 //Debug flags
 //#define OAI_NW_DRV_DEBUG_DC
-//#define OAI_NW_DRV_DEBUG_SEND
-//#define OAI_NW_DRV_DEBUG_RECEIVE
+#define OAI_NW_DRV_DEBUG_SEND
+#define OAI_NW_DRV_DEBUG_RECEIVE
 //#define OAI_NW_DRV_DEBUG_CLASS
 //#define OAI_NW_DRV_DEBUG_GC
 //#define OAI_NW_DRV_DEBUG_DC_MEASURE
@@ -102,7 +102,7 @@
 #define OAI_NW_DRV_TIMER_IDLE                  UINT_MAX
 #define OAI_NW_DRV_TIMER_TICK                  HZ
 
-#define OAI_NW_DRV_PDCPH_SIZE                  sizeof(struct pdcp_data_req_header_t)
+#define OAI_NW_DRV_PDCPH_SIZE                  sizeof(struct pdcp_data_req_header_s)
 #define OAI_NW_DRV_IPV4_SIZE                   20
 #define OAI_NW_DRV_IPV6_SIZE                   40
 
@@ -174,13 +174,13 @@
 #define OAI_NW_DRV_DEFAULT_IPV6_ADDR3 0
 
 
+#define OAI_NW_DRV_IPVX_ADDR_TYPE_UNKNOWN        0
 #define OAI_NW_DRV_IPV6_ADDR_TYPE_UNICAST        1
-#define OAI_NW_DRV_IPV6_ADDR_TYPE_MC_SIGNALLING  2
-#define OAI_NW_DRV_IPV6_ADDR_TYPE_MC_MBMS        3
-#define OAI_NW_DRV_IPV6_ADDR_TYPE_UNKNOWN        4
+#define OAI_NW_DRV_IPV6_ADDR_TYPE_MULTICAST      2
+#define OAI_NW_DRV_IPV6_ADDR_TYPE_UNKNOWN        3
 
 #define OAI_NW_DRV_IPV4_ADDR_TYPE_UNICAST        5
-#define OAI_NW_DRV_IPV4_ADDR_TYPE_MC_SIGNALLING  6
+#define OAI_NW_DRV_IPV4_ADDR_TYPE_MULTICAST      6
 #define OAI_NW_DRV_IPV4_ADDR_TYPE_BROADCAST      7
 #define OAI_NW_DRV_IPV4_ADDR_TYPE_UNKNOWN        8
 

openair2/NAS/DRIVER/LITE/local.h

@@ -65,6 +65,8 @@
 #include "constant.h"
 #include "sap.h"
 
+typedef int traffic_type_t;
+
 struct cx_entity {
   int                        sap[OAI_NW_DRV_SAPI_CX_MAX];
   u8                         state;                     // state of the connection
@@ -113,16 +115,18 @@ struct ipversion {
 #endif
 };
 
-typedef struct pdcp_data_req_header_t {
+typedef struct pdcp_data_req_header_s {
   unsigned int           rb_id;
   unsigned int           data_size;
   int                    inst;
+  traffic_type_t         traffic_type;
 } pdcp_data_req_header_t;
 
-typedef struct pdcp_data_ind_header_t {
+typedef struct pdcp_data_ind_header_s {
   unsigned int           rb_id;
   unsigned int           data_size;
   int                    inst;
+  int                    dummy;
 } pdcp_data_ind_header_t;
 
 
@@ -133,4 +137,4 @@ extern u8 OAI_NW_DRV_NULL_IMEI[14];
 
 
 
-#endif
\ No newline at end of file
+#endif

openair2/NAS/DRIVER/LITE/proto_extern.h

@@ -145,11 +145,10 @@ int oai_nw_drv_CTL_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 // classifier.c
 
 /**
-  \brief Send a socket received from IP to classifier for a particular instance ID.
+  \brief Find the IP traffic type (UNICAST, MULTICAST, BROADCAST) of the IP packet attached to sk_buff.
 */
-void oai_nw_drv_class_send(struct sk_buff *skb,    //!< Pointer to socket buffer
-                          int inst                //!< Instance ID
-                          );
+traffic_type_t oai_nw_drv_find_traffic_type(struct sk_buff  *skb);
+
 
 
 // tool.c

openair2/RRC/LITE/rrc_UE.c

@@ -1218,6 +1218,37 @@ void rrc_ue_process_rrcConnectionReconfiguration(u8 Mod_id, u32 frame,
 #endif
     } // c1 present
   } // critical extensions present
+#ifdef ENABLE_RAL
+  {
+      MessageDef                                 *message_ral_p = NULL;
+      rrc_ral_connection_reestablishment_ind_t    connection_reestablishment_ind;
+      int                                         i;
+
+      message_ral_p = itti_alloc_new_message (TASK_RRC_UE, RRC_RAL_CONNECTION_REESTABLISHMENT_IND);
+      memset(&connection_reestablishment_ind, 0, sizeof(rrc_ral_connection_reestablishment_ind_t));
+      // TO DO ral_si_ind.plmn_id        = 0;
+      connection_reestablishment_ind.ue_id            = Mod_id;
+      if (rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.radioResourceConfigDedicated->drb_ToAddModList != NULL) {
+          connection_reestablishment_ind.num_drb      = rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.radioResourceConfigDedicated->drb_ToAddModList->list.count;
+
+          for (i=0;(i<rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.radioResourceConfigDedicated->drb_ToAddModList->list.count) && (i < maxDRB);i++) {
+              // why minus 1 in RRC code for drb_identity ?
+              connection_reestablishment_ind.drb_id[i]   = rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.radioResourceConfigDedicated->drb_ToAddModList->list.array[i]->drb_Identity;
+          }
+      } else {
+          connection_reestablishment_ind.num_drb      = 0;
+      }
+      if (rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.radioResourceConfigDedicated->srb_ToAddModList != NULL) {
+          connection_reestablishment_ind.num_srb      = rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.radioResourceConfigDedicated->srb_ToAddModList->list.count;
+      } else {
+          connection_reestablishment_ind.num_srb      = 0;
+      }
+      memcpy (&message_ral_p->ittiMsg, (void *) &connection_reestablishment_ind, sizeof(rrc_ral_connection_reestablishment_ind_t));
+#warning "Mod_id ? for instance ?"
+      LOG_I(RRC, "Sending RRC_RAL_CONNECTION_REESTABLISHMENT_IND to mRAL\n");
+      itti_send_msg_to_task (TASK_RAL_UE, Mod_id, message_ral_p);
+  }
+#endif
 }
 
 /* 36.331, 5.3.5.4      Reception of an RRCConnectionReconfiguration including the mobilityControlInfo by the UE (handover) */
@@ -1907,12 +1938,29 @@ int decode_SI(u8 Mod_id,u32 frame,u8 eNB_index,u8 si_window) {
 #ifdef Rel10
       if (UE_rrc_inst[Mod_id].MBMS_flag < 3) // see -Q option
 #endif
-        rrc_ue_generate_RRCConnectionRequest(Mod_id,frame,eNB_index);
+      rrc_ue_generate_RRCConnectionRequest(Mod_id,frame,eNB_index);
       LOG_I(RRC, "not sending connection request\n");
 
       if (UE_rrc_inst[Mod_id].Info[eNB_index].State == RRC_IDLE) {
-        LOG_I(RRC,"[UE %d] Received SIB1/SIB2/SIB3 Switching to RRC_SI_RECEIVED\n",Mod_id);
-        UE_rrc_inst[Mod_id].Info[eNB_index].State = RRC_SI_RECEIVED;
+          LOG_I(RRC,"[UE %d] Received SIB1/SIB2/SIB3 Switching to RRC_SI_RECEIVED\n",Mod_id);
+          UE_rrc_inst[Mod_id].Info[eNB_index].State = RRC_SI_RECEIVED;
+#ifdef ENABLE_RAL
+          {
+              MessageDef                            *message_ral_p = NULL;
+              rrc_ral_system_information_ind_t       ral_si_ind;
+
+              message_ral_p = itti_alloc_new_message (TASK_RRC_UE, RRC_RAL_SYSTEM_INFORMATION_IND);
+              memset(&ral_si_ind, 0, sizeof(rrc_ral_system_information_ind_t));
+              // TO DO ral_si_ind.plmn_id        = 0;
+              ral_si_ind.cell_id        = eNB_index;
+              ral_si_ind.dbm            = 0;
+              ral_si_ind.sinr           = 0;
+              ral_si_ind.link_data_rate = 0;
+              memcpy (&message_ral_p->ittiMsg, (void *) &ral_si_ind, sizeof(rrc_ral_system_information_ind_t));
+#warning "Mod_id ? for instance ?"
+              itti_send_msg_to_task (TASK_RAL_UE, Mod_id, message_ral_p);
+          }
+#endif
       }
       break;
     case SystemInformation_r8_IEs_sib_TypeAndInfo_Member_PR_sib3:
@@ -2481,6 +2529,27 @@ void *rrc_ue_task(void *args_p) {
         break;
       }
 
+      case RRC_RAL_SCAN_REQ:
+          {
+              // TO DO ASK PHY TO DO A SCAN
+              LOG_I(RRC, "[UE %d] Received %s\n", Mod_id, msg_name);
+          }
+
+      case RRC_RAL_CONFIGURE_THRESHOLD_REQ:
+          {
+              LOG_I(RRC, "[UE %d] Received %s\n", Mod_id, msg_name);
+          }
+
+      case RRC_RAL_CONNECTION_ESTABLISHMENT_REQ:
+          {
+              LOG_I(RRC, "[UE %d] Received %s\n", Mod_id, msg_name);
+          }
+
+      case RRC_RAL_CONNECTION_RELEASE_REQ:
+          {
+              LOG_I(RRC, "[UE %d] Received %s\n", Mod_id, msg_name);
+          }
+
       default:
         LOG_E(RRC, "[UE %d] Received unexpected message %s\n", Mod_id, msg_name);
         break;

openair2/RRM_4_RRC_LITE/Makefile

@@ -72,7 +72,42 @@ LDFLAGS +=	-rdynamic
 PROGS =		rrm_exe test_exe
 
 gen-c-from-asn1:
-		cd $(RRC_RRM_ASN1_DIR);asn1c -gen-PER -fcompound-names -fnative-types -fskeletons-copy  $(ASN1_RRC_SPEC_DIR)/EUTRA-RRC-Definitions.asn  $(RRC_RRM_ASN1_DIR)/rrc-rrm.asn; cd -
+		#-fbless-SIZE
+		# Allow SIZE() constraint for INTEGER, ENUMERATED, and other types
+		# for which this constraint is normally prohibited	by  the  stan-
+		# dard.  This  is  a violation of ASN.1 standard, and the compiler
+		# may fail to produce a meaningful code.
+
+		#-fcompound-names
+		# Using this option prevents name collisions in the target	source
+		# code  by	using  complex	names  for target language structures.
+		# (Name collisions may occur if the ASN.1 module reuses  the  same
+		# identifiers in multiple contexts).
+
+		#-findirect-choice
+		# When  generating code for a CHOICE type, compile the CHOICE mem-
+		# bers as indirect pointers instead of declaring them inline. Con-
+		# sider  using this option together with -fno-include-deps to pre-
+		# vent circular references.
+
+		#-fknown-extern-type=<name>
+		# Pretend the specified type is known. The	compiler  will	assume
+		# the  target  language  source files for the given type have been
+		# provided manually.
+
+		#-fno-constraints
+		# Do not generate ASN.1 subtype constraint checking code. This may
+		# make a shorter executable.
+
+		#-fno-include-deps
+		# Do  not  generate  courtesy #include lines for non-critical type
+		# dependencies.  Helps prevent namespace collisions.
+
+		#-funnamed-unions
+		# Enable unnamed unions in the definitions	of  target  language's
+		# structures.
+		#cd $(RRC_RRM_ASN1_DIR);asn1c -gen-PER -fcompound-names -fnative-types -fskeletons-copy  $(ASN1_RRC_SPEC_DIR)/EUTRA-RRC-Definitions.asn  $(RRC_RRM_ASN1_DIR)/rrc-rrm.asn; cd -
+		cd $(RRC_RRM_ASN1_DIR);asn1c -gen-PER  -fno-include-deps -fcompound-names -fnative-types -fskeletons-copy  $(ASN1_RRC_SPEC_DIR)/EUTRA-RRC-Definitions.asn  $(RRC_RRM_ASN1_DIR)/rrc-rrm.asn; cd -
 
 
 libs:

openair2/RRM_4_RRC_LITE/src/com/Message.cpp

@@ -6,9 +6,9 @@
 #include <string.h>
 #include <arpa/inet.h>
 //-----------------------------------------------------------------
+#include "Message.h"
 #include "RRC-RRM-Message.h"
 #include "RRM-RRC-Message.h"
-#include "Message.h"
 #include "Utility.h"
 #include "RRC2RRMMessageConnectionRequest.h"
 #include "RRC2RRMMessageAddUserRequest.h"
@@ -589,6 +589,7 @@ std::string Message::StatusToString(msg_response_status_t statusP)
         default:
             result << "UNKNOWN STATUS " << statusP; return result.str();
     }
+    return result.str();
 }
 //----------------------------------------------------------------------------
 std::string Message::ReasonToString(msg_response_reason_t reasonP)
@@ -624,6 +625,7 @@ std::string Message::ReasonToString(msg_response_reason_t reasonP)
         default:
             result << "UNKNOWN REASON " << reasonP; return result.str();
     }
+    return result.str();
 }
 //-----------------------------------------------------------------
 Message::~Message()

openair2/RRM_4_RRC_LITE/src/com/asn1/Makefile.am.sample

@@ -866,5 +866,5 @@ clean:
 regen: regenerate-from-asn1-source
 
 regenerate-from-asn1-source:
-	asn1c -gen-PER -fcompound-names -fnative-types -fskeletons-copy /homes/gauthier/PROJETS/OPENAIR4G/openair2/RRM_4_RRC_LITE/src/foreign/generated_c_asn1_rrc/ASN1_files/EUTRA-RRC-Definitions.asn /homes/gauthier/PROJETS/OPENAIR4G/openair2/RRM_4_RRC_LITE/src/com/asn1/rrc-rrm.asn
+	asn1c -gen-PER -fno-include-deps -fcompound-names -fnative-types -fskeletons-copy /homes/gauthier/PROJETS/trunk/openair2/RRM_4_RRC_LITE/src/foreign/generated_c_asn1_rrc/ASN1_files/EUTRA-RRC-Definitions.asn /homes/gauthier/PROJETS/trunk/openair2/RRM_4_RRC_LITE/src/com/asn1/rrc-rrm.asn
 

openair2/UTIL/LOG/log.c

@@ -308,6 +308,22 @@ int logInit (void)
     g_log->log_component[OSA].filelog = 0;
     g_log->log_component[OSA].filelog_name = "";