ENDC: Basic implementation of x2ap_eNB_generate_ENDC_x2_SgNB_addition_request()

openair2/COMMON/x2ap_messages_types.h

@@ -303,4 +303,35 @@ typedef struct x2ap_senb_addition_req_ack_s {
 
 } x2ap_senb_addition_req_ack_t;
 
+typedef struct x2ap_ENDC_sgnb_addition_req_s {
+  /* used for RRC->X2AP in source eNB */
+  int rnti;
+
+  security_capabilities_t security_capabilities;
+
+  uint8_t      kgnb[32]; // keNB or keNB*
+
+  /*next_hop_chaining_coun */
+  long int     kgnb_ncc;
+
+  /* UE aggregate maximum bitrate */
+  ambr_t ue_ambr;
+
+  uint8_t nb_e_rabs_tobesetup;
+
+ /* list of e_rab setup-ed by RRC layers */
+  e_rab_setup_t e_rabs_tobesetup[S1AP_MAX_E_RAB];
+
+  /* list of e_rab to be setup by RRC layers */
+  e_rab_t  e_rab_param[S1AP_MAX_E_RAB];
+
+  x2ap_lastvisitedcell_info_t lastvisitedcell_info;
+
+  uint8_t rrc_buffer[8192 /* arbitrary, big enough */];
+  int rrc_buffer_size;
+
+  int target_assoc_id;
+} x2ap_ENDC_sgnb_addition_req__t;
+
+
 #endif /* X2AP_MESSAGES_TYPES_H_ */

openair2/X2AP/x2ap_eNB_generate_messages.h

@@ -70,4 +70,6 @@ int x2ap_gNB_generate_ENDC_x2_setup_request(x2ap_eNB_instance_t *instance_p, x2a
 
 int x2ap_eNB_generate_ENDC_x2_setup_response( x2ap_eNB_instance_t *instance_p, x2ap_eNB_data_t *x2ap_eNB_data_p);
 
+int x2ap_eNB_generate_ENDC_x2_SgNB_addition_request( x2ap_eNB_instance_t *instance_p, x2ap_eNB_data_t *x2ap_eNB_data_p, int ue_id);
+
 #endif /*  X2AP_ENB_GENERATE_MESSAGES_H_ */

openair3/UTILS/conversions.h

@@ -116,8 +116,14 @@ do {                                \
 #define INT16_TO_OCTET_STRING(x, aSN)           \
 do {                                            \
     (aSN)->buf = calloc(2, sizeof(uint8_t));    \
-    (aSN)->size = 2;              \
-    INT16_TO_BUFFER(x, (aSN)->buf);             \
+    INT16_TO_BUFFER(x, ((aSN)->buf));           \
+    (aSN)->size = 2;                            \
+} while(0)
+
+#define INT16_TO_BIT_STRING(x, aSN) \
+do {                                \
+    INT16_TO_OCTET_STRING(x, aSN);  \
+    (aSN)->bits_unused = 0;         \
 } while(0)
 
 #define INT8_TO_OCTET_STRING(x, aSN)            \