[ip.access] Parse cell global ID as part of BCCH info
diff --git a/openbsc/include/openbsc/abis_nm.h b/openbsc/include/openbsc/abis_nm.h
index a9bfcee..56f8e52 100644
--- a/openbsc/include/openbsc/abis_nm.h
+++ b/openbsc/include/openbsc/abis_nm.h
@@ -684,9 +684,18 @@
 	IPAC_BINF_CELL_ALLOC		= (1 << 2),
 };
 
+struct cell_global_id {
+	u_int16_t mcc;
+	u_int16_t mnc;
+	u_int16_t lac;
+	u_int16_t ci;
+};
+
 /* The BCCH info from an ip.access test, in host byte order
  * and already parsed... */
 struct ipac_bcch_info {
+	struct llist_head list;
+
 	u_int16_t info_type;
 	u_int8_t freq_qual;
 	u_int16_t arfcn;
@@ -696,7 +705,7 @@
 	u_int16_t frame_offset;
 	u_int32_t frame_nr_offset;
 	u_int8_t bsic;
-	u_int8_t cgi[7];
+	struct cell_global_id cgi;
 	u_int8_t ba_list_si2[16];
 	u_int8_t ba_list_si2bis[16];
 	u_int8_t ba_list_si2ter[16];