X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=mc-core%2Fmc%2Flocal%2FSgNB_ack_for_ue_NRfreqs.h;h=cc6160a50bd5442cc99928b18eb783f3dc7bf5f2;hb=e81291ed4835042659abf2b0d59f9f928486ed5d;hp=9b0d034c9004e0877c7856a56769f64b26de2418;hpb=31d238a2cba18b87e05a7d9b4820db2c5186c658;p=ric-app%2Fmc.git

diff --git a/mc-core/mc/local/SgNB_ack_for_ue_NRfreqs.h b/mc-core/mc/local/SgNB_ack_for_ue_NRfreqs.h
index 9b0d034..cc6160a 100644
--- a/mc-core/mc/local/SgNB_ack_for_ue_NRfreqs.h
+++ b/mc-core/mc/local/SgNB_ack_for_ue_NRfreqs.h
@@ -23,30 +23,15 @@
 
 #include "packet.h"
 
+
+#include "/usr/local/include/protobuf-c/protobuf-c.h"
+
 struct _SgNB_ack_for_ue_NRfreqs {
 	gs_uint64_t timestamp_ms;
 	gs_sp_t gnb_id;
 	gs_int64_t id_MeNB_UE_X2AP_ID;
 	gs_int64_t id_SgNB_UE_X2AP_ID;
 	gs_uint32_t id_MeNB_UE_X2AP_ID_Extension;
-	gs_sp_t scg_CellGroupConfig;
-	gs_int8_t scg_CellGroupConfig_exists;
-	gs_int64_t candidate_serving_cell_freqs0;
-	gs_int8_t candidate_serving_cell_freqs0_exists;
-	gs_int64_t candidate_serving_cell_freqs1;
-	gs_int8_t candidate_serving_cell_freqs1_exists;
-	gs_int64_t candidate_serving_cell_freqs2;
-	gs_int8_t candidate_serving_cell_freqs2_exists;
-	gs_int64_t candidate_serving_cell_freqs3;
-	gs_int8_t candidate_serving_cell_freqs3_exists;
-	gs_int64_t candidate_serving_cell_freqs4;
-	gs_int8_t candidate_serving_cell_freqs4_exists;
-	gs_int64_t candidate_serving_cell_freqs5;
-	gs_int8_t candidate_serving_cell_freqs5_exists;
-	gs_int64_t candidate_serving_cell_freqs6;
-	gs_int8_t candidate_serving_cell_freqs6_exists;
-	gs_int64_t candidate_serving_cell_freqs7;
-	gs_int8_t candidate_serving_cell_freqs7_exists;
 	gs_uint32_t measuredFrequenciesSN0;
 	gs_int8_t measuredFrequenciesSN0_exists;
 	gs_uint32_t measuredFrequenciesSN1;
@@ -63,18 +48,25 @@ struct _SgNB_ack_for_ue_NRfreqs {
 	gs_int8_t measuredFrequenciesSN6_exists;
 	gs_uint32_t measuredFrequenciesSN7;
 	gs_int8_t measuredFrequenciesSN7_exists;
+	gs_int64_t candidate_serving_cell_freqs0;
+	gs_int8_t candidate_serving_cell_freqs0_exists;
+	gs_int64_t candidate_serving_cell_freqs1;
+	gs_int8_t candidate_serving_cell_freqs1_exists;
+	gs_int64_t candidate_serving_cell_freqs2;
+	gs_int8_t candidate_serving_cell_freqs2_exists;
+	gs_int64_t candidate_serving_cell_freqs3;
+	gs_int8_t candidate_serving_cell_freqs3_exists;
+	gs_int64_t candidate_serving_cell_freqs4;
+	gs_int8_t candidate_serving_cell_freqs4_exists;
+	gs_int64_t candidate_serving_cell_freqs5;
+	gs_int8_t candidate_serving_cell_freqs5_exists;
+	gs_int64_t candidate_serving_cell_freqs6;
+	gs_int8_t candidate_serving_cell_freqs6_exists;
+	gs_int64_t candidate_serving_cell_freqs7;
+	gs_int8_t candidate_serving_cell_freqs7_exists;
 };
 
 static inline void init__SgNB_ack_for_ue_NRfreqs(struct _SgNB_ack_for_ue_NRfreqs *m){
-	m->scg_CellGroupConfig_exists=0;
-	m->candidate_serving_cell_freqs0_exists=0;
-	m->candidate_serving_cell_freqs1_exists=0;
-	m->candidate_serving_cell_freqs2_exists=0;
-	m->candidate_serving_cell_freqs3_exists=0;
-	m->candidate_serving_cell_freqs4_exists=0;
-	m->candidate_serving_cell_freqs5_exists=0;
-	m->candidate_serving_cell_freqs6_exists=0;
-	m->candidate_serving_cell_freqs7_exists=0;
 	m->measuredFrequenciesSN0_exists=0;
 	m->measuredFrequenciesSN1_exists=0;
 	m->measuredFrequenciesSN2_exists=0;
@@ -83,6 +75,14 @@ static inline void init__SgNB_ack_for_ue_NRfreqs(struct _SgNB_ack_for_ue_NRfreqs
 	m->measuredFrequenciesSN5_exists=0;
 	m->measuredFrequenciesSN6_exists=0;
 	m->measuredFrequenciesSN7_exists=0;
+	m->candidate_serving_cell_freqs0_exists=0;
+	m->candidate_serving_cell_freqs1_exists=0;
+	m->candidate_serving_cell_freqs2_exists=0;
+	m->candidate_serving_cell_freqs3_exists=0;
+	m->candidate_serving_cell_freqs4_exists=0;
+	m->candidate_serving_cell_freqs5_exists=0;
+	m->candidate_serving_cell_freqs6_exists=0;
+	m->candidate_serving_cell_freqs7_exists=0;
 }
 
 static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__timestamp_ms(struct packet *p, gs_uint64_t *t){
@@ -91,10 +91,13 @@ static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__timestamp_ms(struct packe
 }
 
 static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__gnb_id(struct packet *p, struct gs_string *t){
-t->data = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->gnb_id;
-	t->length = strlen(t->data);
 	t->owner=0;
-	return 0;
+	t->data = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->gnb_id;
+	if( t->data == NULL){
+		t->length=0;
+		return 0;
+	}
+	t->length = strlen(t->data);
 }
 
 static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__id_MeNB_UE_X2AP_ID(struct packet *p, gs_int64_t *t){
@@ -112,11 +115,44 @@ static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__id_MeNB_UE_X2AP_ID_Extens
 	return 0;
 }
 
-static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__scg_CellGroupConfig(struct packet *p, struct gs_string *t){
-t->data = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->scg_CellGroupConfig;
-	t->length = strlen(t->data);
-	t->owner=0;
-	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->scg_CellGroupConfig==0);
+static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN0(struct packet *p, gs_uint32_t *t){
+	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN0;
+	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN0==0);
+}
+
+static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN1(struct packet *p, gs_uint32_t *t){
+	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN1;
+	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN1==0);
+}
+
+static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN2(struct packet *p, gs_uint32_t *t){
+	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN2;
+	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN2==0);
+}
+
+static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN3(struct packet *p, gs_uint32_t *t){
+	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN3;
+	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN3==0);
+}
+
+static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN4(struct packet *p, gs_uint32_t *t){
+	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN4;
+	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN4==0);
+}
+
+static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN5(struct packet *p, gs_uint32_t *t){
+	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN5;
+	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN5==0);
+}
+
+static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN6(struct packet *p, gs_uint32_t *t){
+	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN6;
+	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN6==0);
+}
+
+static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN7(struct packet *p, gs_uint32_t *t){
+	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN7;
+	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN7==0);
 }
 
 static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__candidate_serving_cell_freqs0(struct packet *p, gs_int64_t *t){
@@ -159,44 +195,4 @@ static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__candidate_serving_cell_fr
 	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->candidate_serving_cell_freqs7==0);
 }
 
-static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN0(struct packet *p, gs_uint32_t *t){
-	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN0;
-	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN0==0);
-}
-
-static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN1(struct packet *p, gs_uint32_t *t){
-	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN1;
-	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN1==0);
-}
-
-static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN2(struct packet *p, gs_uint32_t *t){
-	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN2;
-	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN2==0);
-}
-
-static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN3(struct packet *p, gs_uint32_t *t){
-	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN3;
-	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN3==0);
-}
-
-static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN4(struct packet *p, gs_uint32_t *t){
-	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN4;
-	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN4==0);
-}
-
-static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN5(struct packet *p, gs_uint32_t *t){
-	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN5;
-	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN5==0);
-}
-
-static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN6(struct packet *p, gs_uint32_t *t){
-	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN6;
-	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN6==0);
-}
-
-static inline gs_retval_t get_SgNB_ack_for_ue_NRfreqs__measuredFrequenciesSN7(struct packet *p, gs_uint32_t *t){
-	*t = ((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN7;
-	return (((struct _SgNB_ack_for_ue_NRfreqs *)(p->record.packed.values))->measuredFrequenciesSN7==0);
-}
-
 #endif