Move dissect_geographical_description() from gsm_map to gsm_a_common to make it easier to use it in other dissectors including it from gsm_map makes in neccesarry to include asn1.h.

Fix some bugs in the code, use it from bssmap.

svn path=/trunk/; revision=26603

6 files changed, 352 insertions, 307 deletions

diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index ec46704461..fd1bb7a545 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -2435,7 +2435,7 @@ be_loc_type(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gcha
 	/*
 	proto_tree_add_item(tree, hf_gsm_a_rr_chnl_needed_ch1, tvb, curr_offset, 1, FALSE);
 	*/
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 
 
 	return(len);
@@ -2449,14 +2449,13 @@ be_loc_type(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gcha
 static guint8
 be_loc_est(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
 {
+	tvbuff_t *data_tvb;
 	guint32	curr_offset;
 
 	curr_offset = offset;
-	/*
-	proto_tree_add_item(tree, hf_gsm_a_rr_chnl_needed_ch1, tvb, curr_offset, 1, FALSE);
-	*/
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
 
+	data_tvb = tvb_new_subset(tvb, curr_offset, len, len);
+	dissect_geographical_description(data_tvb, g_pinfo, tree);
 
 	return(len);
 }
@@ -2473,7 +2472,7 @@ be_pos_data(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gcha
 	/*
 	proto_tree_add_item(tree, hf_gsm_a_rr_chnl_needed_ch1, tvb, curr_offset, 1, FALSE);
 	*/
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 
 
 	return(len);
@@ -2489,7 +2488,7 @@ be_lcs_cause(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gch
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len, "Not decoded yet");
 
 
 	return(len);
@@ -2505,7 +2504,7 @@ be_lcs_client(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gc
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 
 
 	return(len);
@@ -2562,12 +2561,12 @@ be_apdu(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_s
 	case 2:
 		/* LLP
 		 * The embedded message contains a Facility Information Element as defined in 3GPP TS 04.71
-		 * excluding the Facility IEI and length of Facility IEI octets defined in 3GPP TS 04.71.
+		 * excluding the Facility IEI and length of Facility IEI octets defined in 3GPP TS 04.71.(3GPP TS 44.071).
 		 */
 		break;
 	case 3:
 		/* SMLCPP
-		 * The embedded message is as defined in 3GPP TS 08.31
+		 * The embedded message is as defined in 3GPP TS 08.31(TS 48.031).
 		 */
 		break;
 	default:
@@ -2595,7 +2594,7 @@ be_gps_assist_data(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 
 
 	return(len);
@@ -2615,7 +2614,7 @@ be_decihp_keys(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, g
 	/*
 	proto_tree_add_item(tree, hf_gsm_a_rr_chnl_needed_ch1, tvb, curr_offset, 1, FALSE);
 	*/
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 
 
 	return(len);
@@ -2631,7 +2630,7 @@ be_ret_err_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, g
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 
 	return(len);
 }
@@ -2646,7 +2645,7 @@ be_ret_err_cause(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_,
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 
 	return(len);
 }
@@ -2661,7 +2660,7 @@ be_seg(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *ad
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 
 	return(len);
 }
@@ -2675,7 +2674,7 @@ be_serv_ho(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 
 	return(len);
 }
@@ -2691,7 +2690,7 @@ be_src_rnc_to_tar_rnc_umts(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 	/* The Source RNC to Target RNC transparent Information value is encoded as 
 	 * the Source RNC to Target RNC Transparent Container IE as defined in relevant 
 	 * RANAP specification 3GPP TS 25.413, excluding RANAP tag 
@@ -2709,7 +2708,7 @@ be_src_rnc_to_tar_rnc_cdma(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 	/* The Source RNC to Target RNC transparent Information value (structure and encoding) 
 	 * for cdma2000 is defined in relevant specifications.
 	 */
@@ -2727,7 +2726,7 @@ be_geran_cls_m(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, g
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 	/* The Source RNC to Target RNC transparent Information value (structure and encoding) 
 	 * for cdma2000 is defined in relevant specifications.
 	 */
@@ -2748,7 +2747,7 @@ be_new_bss_to_old_bss_inf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 
 	return(len);
 }
@@ -2762,7 +2761,7 @@ be_inter_sys_inf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_,
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 
 	return(len);
 }
@@ -2776,7 +2775,7 @@ be_sna_acc_inf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, g
 
 	curr_offset = offset;
 
-	proto_tree_add_text(tree, tvb, curr_offset+1, len -1, "Not decoded yet");
+	proto_tree_add_text(tree, tvb, curr_offset, len , "Not decoded yet");
 
 	return(len);
 }
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c
index 5a6edff981..f9fe8044c9 100644
--- a/epan/dissectors/packet-gsm_a_common.c
+++ b/epan/dissectors/packet-gsm_a_common.c
@@ -33,6 +33,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <math.h>
 
 #include <string.h>
 
@@ -311,6 +312,24 @@ static int hf_gsm_a_ms_measurement_capability = -1;
 static int hf_gsm_a_sms_value =-1;
 static int hf_gsm_a_sm_value =-1;
 
+static int hf_gsm_a_geo_loc_type_of_shape = -1;
+static int hf_gsm_a_geo_loc_sign_of_lat	= -1;
+static int hf_gsm_a_geo_loc_deg_of_lat =-1;
+static int hf_gsm_a_geo_loc_deg_of_long =-1;
+static int hf_gsm_a_geo_loc_uncertainty_code = -1;
+static int hf_gsm_a_geo_loc_uncertainty_semi_major = -1;
+static int hf_gsm_a_geo_loc_uncertainty_semi_minor = -1;
+static int hf_gsm_a_geo_loc_orientation_of_major_axis = -1;
+static int hf_gsm_a_geo_loc_uncertainty_altitude = -1;
+static int hf_gsm_a_geo_loc_confidence = -1;
+static int hf_gsm_a_geo_loc_no_of_points = -1;
+static int hf_gsm_a_geo_loc_D = -1;
+static int hf_gsm_a_geo_loc_altitude = -1;
+static int hf_gsm_a_geo_loc_inner_radius = -1;
+static int hf_gsm_a_geo_loc_uncertainty_radius = -1;
+static int hf_gsm_a_geo_loc_offset_angle = -1;
+static int hf_gsm_a_geo_loc_included_angle = -1;
+
 static char a_bigbuf[1024];
 
 sccp_msg_info_t* sccp_msg;
@@ -319,6 +338,220 @@ sccp_assoc_info_t* sccp_assoc;
 #define	NUM_GSM_COMMON_ELEM (sizeof(gsm_common_elem_strings)/sizeof(value_string))
 gint ett_gsm_common_elem[NUM_GSM_COMMON_ELEM];
 
+
+#define  ELLIPSOID_POINT 0
+#define  ELLIPSOID_POINT_WITH_UNCERT_CIRC 1
+#define  ELLIPSOID_POINT_WITH_UNCERT_ELLIPSE 3
+#define  POLYGON 5
+#define  ELLIPSOID_POINT_WITH_ALT 8
+#define  ELLIPSOID_POINT_WITH_ALT_AND_UNCERT_ELLIPSOID 9
+#define  ELLIPSOID_ARC 10
+/*
+4 3 2 1
+0 0 0 0 Ellipsoid Point
+0 0 0 1 Ellipsoid point with uncertainty Circle
+0 0 1 1 Ellipsoid point with uncertainty Ellipse
+0 1 0 1 Polygon 
+1 0 0 0 Ellipsoid point with altitude
+1 0 0 1 Ellipsoid point with altitude and uncertainty Ellipsoid
+1 0 1 0 Ellipsoid Arc
+other values reserved for future use
+*/
+
+/* TS 23 032 Table 2a: Coding of Type of Shape */
+static const value_string type_of_shape_vals[] = {
+	{ ELLIPSOID_POINT,		"Ellipsoid Point"},
+	{ ELLIPSOID_POINT_WITH_UNCERT_CIRC,		"Ellipsoid point with uncertainty Circle"},
+	{ ELLIPSOID_POINT_WITH_UNCERT_ELLIPSE,		"Ellipsoid point with uncertainty Ellipse"},
+	{ POLYGON,		"Polygon"},
+	{ ELLIPSOID_POINT_WITH_ALT,		"Ellipsoid point with altitude"},
+	{ ELLIPSOID_POINT_WITH_ALT_AND_UNCERT_ELLIPSOID,		"Ellipsoid point with altitude and uncertainty Ellipsoid"},
+	{ ELLIPSOID_ARC,		"Ellipsoid Arc"},
+	{ 0,	NULL }
+};
+
+/* 3GPP TS 23.032 7.3.1 */
+static const value_string sign_of_latitude_vals[] = {
+	{ 0,		"North"},
+	{ 1,		"South"},
+	{ 0,	NULL }
+};
+
+static const value_string dir_of_alt_vals[] = {
+	{ 0,		"Altitude expresses height"},
+	{ 1,		"Altitude expresses depth"},
+	{ 0,	NULL }
+};
+
+void
+dissect_geographical_description(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree){
+
+	proto_item *lat_item, *long_item, *major_item, *minor_item, *alt_item, *uncer_item;
+	/*proto_tree *subtree; */
+
+	guint8 type_of_shape;
+	guint8 no_of_points;
+	int offset = 0;
+	int length;
+	guint8 value;
+	guint32 value32;
+
+	/*subtree = proto_item_add_subtree(item, ett_gsm_a_geo_desc);*/
+
+	length = tvb_reported_length_remaining(tvb,0);
+	/* Geographical Location 
+	 * The Location Estimate field is composed of 1 or more octets with an internal structure 
+	 * according to section 7 in [23.032].
+	 */
+	proto_tree_add_item(tree, hf_gsm_a_geo_loc_type_of_shape, tvb, 0, 1, FALSE);
+	if (length<2)
+		return;
+	type_of_shape = tvb_get_guint8(tvb,offset)>>4;
+	switch (type_of_shape){
+	case ELLIPSOID_POINT:	
+		/* Ellipsoid Point */
+	case ELLIPSOID_POINT_WITH_UNCERT_CIRC:
+		/* Ellipsoid Point with uncertainty Circle */
+	case ELLIPSOID_POINT_WITH_UNCERT_ELLIPSE:
+		/* Ellipsoid Point with uncertainty Ellipse */
+	case ELLIPSOID_POINT_WITH_ALT:
+		/* Ellipsoid Point with Altitude */
+	case ELLIPSOID_POINT_WITH_ALT_AND_UNCERT_ELLIPSOID:
+		/* Ellipsoid Point with altitude and uncertainty ellipsoid */
+	case ELLIPSOID_ARC:
+		/* Ellipsoid Arc */
+		offset++;
+		if (length<4)
+			return;
+		proto_tree_add_item(tree, hf_gsm_a_geo_loc_sign_of_lat, tvb, offset, 1, FALSE);
+
+		value32 = tvb_get_ntoh24(tvb,offset)&0x7fffff;
+		/* convert degrees (X/0x7fffff) * 90 = degrees */
+		lat_item = proto_tree_add_item(tree, hf_gsm_a_geo_loc_deg_of_lat, tvb, offset, 3, FALSE);
+		proto_item_append_text(lat_item,"(%.5f degrees)", (((double)value32/8388607) * 90));
+		if (length<7)
+			return;
+		offset = offset + 3;
+		value32 = tvb_get_ntoh24(tvb,offset)&0x7fffff;
+		long_item = proto_tree_add_item(tree, hf_gsm_a_geo_loc_deg_of_long, tvb, offset, 3, FALSE);
+		/* (X/0xffffff) *360 = degrees */
+		proto_item_append_text(long_item,"(%.5f degrees)", (((double)value32/16777215) * 360));
+		offset = offset + 3;
+		if(type_of_shape==ELLIPSOID_POINT_WITH_UNCERT_CIRC){
+			/* Ellipsoid Point with uncertainty Circle */
+			if (length<8)
+				return;
+			/* Uncertainty code */
+			value = tvb_get_guint8(tvb,offset)&0x7f;
+			uncer_item = proto_tree_add_item(tree, hf_gsm_a_geo_loc_uncertainty_code, tvb, offset, 1, FALSE);
+			proto_item_append_text(uncer_item,"(%.1f m)", 10 * (pow(1.1, (double)value) - 1));
+		}else if(type_of_shape==ELLIPSOID_POINT_WITH_UNCERT_ELLIPSE){
+			/* Ellipsoid Point with uncertainty Ellipse */
+			/* Uncertainty semi-major octet 10
+			 * To convert to metres 10*(((1.1)^X)-1) 
+			 */
+			value = tvb_get_guint8(tvb,offset)&0x7f; 
+			major_item = proto_tree_add_item(tree, hf_gsm_a_geo_loc_uncertainty_semi_major, tvb, offset, 1, FALSE);
+			proto_item_append_text(major_item,"(%.1f m)", 10 * (pow(1.1, (double)value) - 1));
+			offset++;
+			/* Uncertainty semi-minor Octet 11
+			 * To convert to metres 10*(((1.1)^X)-1) 
+			 */
+			value = tvb_get_guint8(tvb,offset)&0x7f; 
+			minor_item = proto_tree_add_item(tree, hf_gsm_a_geo_loc_uncertainty_semi_minor, tvb, offset, 1, FALSE);
+			proto_item_append_text(minor_item,"(%.1f m)", 10 * (pow(1.1, (double)value) - 1));
+			offset++;
+			/* Orientation of major axis octet 12
+			 * allowed value from 0-179 to convert 
+			 * to actual degrees multiply by 2.
+			 */
+			value = tvb_get_guint8(tvb,offset)&0x7f;
+			proto_tree_add_uint(tree, hf_gsm_a_geo_loc_orientation_of_major_axis, tvb, offset, 1, value*2);
+			offset++;
+			/* Confidence */
+			proto_tree_add_item(tree, hf_gsm_a_geo_loc_confidence, tvb, offset, 1, FALSE);
+			offset++;
+		}else if(type_of_shape==ELLIPSOID_POINT_WITH_ALT){
+			/* Ellipsoid Point with Altitude */
+			/*D: Direction of Altitude */
+			proto_tree_add_item(tree, hf_gsm_a_geo_loc_D, tvb, offset, 1, FALSE);
+			/* Altitude */
+			proto_tree_add_item(tree, hf_gsm_a_geo_loc_altitude, tvb, offset, 2, FALSE);
+		}else if(type_of_shape==ELLIPSOID_POINT_WITH_ALT_AND_UNCERT_ELLIPSOID){
+			/* Ellipsoid Point with altitude and uncertainty ellipsoid */
+			/*D: Direction of Altitude octet 8,9 */
+			proto_tree_add_item(tree, hf_gsm_a_geo_loc_D, tvb, offset, 1, FALSE);
+			/* Altitude Octet 8,9*/
+			proto_tree_add_item(tree, hf_gsm_a_geo_loc_altitude, tvb, offset, 2, FALSE);
+			offset = offset +2;
+			/* Uncertainty semi-major octet 10
+			 * To convert to metres 10*(((1.1)^X)-1) 
+			 */
+			value = tvb_get_guint8(tvb,offset)&0x7f; 
+			major_item = proto_tree_add_item(tree, hf_gsm_a_geo_loc_uncertainty_semi_major, tvb, offset, 1, FALSE);
+			proto_item_append_text(major_item,"(%.1f m)", 10 * (pow(1.1, (double)value) - 1));
+			offset++;
+			/* Uncertainty semi-minor Octet 11
+			 * To convert to metres 10*(((1.1)^X)-1) 
+			 */
+			value = tvb_get_guint8(tvb,offset)&0x7f; 
+			minor_item = proto_tree_add_item(tree, hf_gsm_a_geo_loc_uncertainty_semi_minor, tvb, offset, 1, FALSE);
+			proto_item_append_text(minor_item,"(%.1f m)", 10 * (pow(1.1, (double)value) - 1));
+			offset++;
+			/* Orientation of major axis octet 12
+			 * allowed value from 0-179 to convert 
+			 * to actual degrees multiply by 2.
+			 */
+			value = tvb_get_guint8(tvb,offset)&0x7f;
+			proto_tree_add_uint(tree, hf_gsm_a_geo_loc_orientation_of_major_axis, tvb, offset, 1, value*2);
+			offset++;
+			/* Uncertainty Altitude 13
+			 * to convert to metres 45*(((1.025)^X)-1) 
+			 */
+			value = tvb_get_guint8(tvb,offset)&0x7f; 
+			alt_item = proto_tree_add_item(tree, hf_gsm_a_geo_loc_uncertainty_altitude, tvb, offset, 1, FALSE);
+			proto_item_append_text(alt_item,"(%.1f m)", 45 * (pow(1.025, (double)value) - 1));
+			offset++;
+			/* Confidence octet 14
+			 */
+			proto_tree_add_item(tree, hf_gsm_a_geo_loc_confidence, tvb, offset, 1, FALSE);
+		}else if(type_of_shape==ELLIPSOID_ARC){
+			/* Ellipsoid Arc */
+			/* Inner radius */
+			proto_tree_add_item(tree, hf_gsm_a_geo_loc_inner_radius, tvb, offset, 2, FALSE);
+			offset= offset +2;
+			/* Uncertainty radius */
+			proto_tree_add_item(tree, hf_gsm_a_geo_loc_uncertainty_radius, tvb, offset, 1, FALSE);
+			offset++;
+			/* Offset angle */
+			proto_tree_add_item(tree, hf_gsm_a_geo_loc_offset_angle, tvb, offset, 1, FALSE);
+			offset++;
+			/* Included angle */
+			proto_tree_add_item(tree, hf_gsm_a_geo_loc_included_angle, tvb, offset, 1, FALSE);
+			offset++;
+			/* Confidence */
+			proto_tree_add_item(tree, hf_gsm_a_geo_loc_confidence, tvb, offset, 1, FALSE);
+		}
+
+		break;
+	case POLYGON:					/* Polygon */
+		/* Number of points */
+		no_of_points = tvb_get_guint8(tvb,offset)&0x0f;
+		proto_tree_add_item(tree, hf_gsm_a_geo_loc_no_of_points, tvb, offset, 1, FALSE);
+		/*
+		while ( no_of_points > 0){
+			offset++;
+
+			no_of_points--;
+		}
+		*/
+		break;
+	default:
+		break;
+	}
+
+}
+
 const char* get_gsm_a_msg_string(int pdu_type, int idx)
 {
 	const char *msg_string=NULL;
@@ -2020,7 +2253,91 @@ proto_register_gsm_a_common(void)
 		{ "SM_VALUE (Switch-Measure", "gsm_a.classmark3.sm_value",
 		FT_UINT8, BASE_DEC, VALS(gsm_a_sms_vals), 0x0,"SM_VALUE (Switch-Measure", HFILL}
 	},
-
+	{ &hf_gsm_a_geo_loc_type_of_shape,
+		{ "Location estimate","gsm_a.gad.location_estimate",
+		FT_UINT8,BASE_DEC, VALS(type_of_shape_vals), 0xf0,          
+		"Location estimate", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_sign_of_lat,
+		{ "Sign of latitude","gsm_a.gad.sign_of_latitude",
+		FT_UINT8,BASE_DEC, VALS(sign_of_latitude_vals), 0x80,          
+		"Sign of latitude", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_deg_of_lat,
+		{ "Degrees of latitude","gsm_a.gad.sign_of_latitude",
+		FT_UINT24,BASE_DEC, NULL, 0x7fffff,          
+		"Degrees of latitude", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_deg_of_long,
+		{ "Degrees of longitude","gsm_a.gad.sign_of_longitude",
+		FT_UINT24,BASE_DEC, NULL, 0xffffff,          
+		"Degrees of longitude", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_uncertainty_code,
+		{ "Uncertainty code","gsm_a.gad.uncertainty_code",
+		FT_UINT8,BASE_DEC, NULL, 0x7f,          
+		"Uncertainty code", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_uncertainty_semi_major,
+		{ "Uncertainty semi-major","gsm_a.gad.uncertainty_semi_major",
+		FT_UINT8,BASE_DEC, NULL, 0x7f,          
+		"Uncertainty semi-major", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_uncertainty_semi_minor,
+		{ "Uncertainty semi-minor","gsm_a.gad.uncertainty_semi_minor",
+		FT_UINT8,BASE_DEC, NULL, 0x7f,          
+		"Uncertainty semi-minor", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_orientation_of_major_axis,
+		{ "Orientation of major axis","gsm_a.gad.orientation_of_major_axis",
+		FT_UINT8,BASE_DEC, NULL, 0x0,          
+		"Orientation of major axis", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_uncertainty_altitude,
+		{ "Uncertainty Altitude","gsm_a.gad.uncertainty_altitude",
+		FT_UINT8,BASE_DEC, NULL, 0x7f,          
+		"Uncertainty Altitude", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_confidence,
+		{ "Confidence(%)","gsm_a.gad.confidence",
+		FT_UINT8,BASE_DEC, NULL, 0x7f,          
+		"Confidence(%)", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_no_of_points,
+		{ "Number of points","gsm_a.gad.no_of_points",
+		FT_UINT8,BASE_DEC, NULL, 0x0f,          
+		"Number of points", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_D,
+		{ "D: Direction of Altitude","gsm_a.gad.D",
+		FT_UINT16,BASE_DEC, VALS(dir_of_alt_vals), 0x8000,          
+		"D: Direction of Altitude", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_altitude,
+		{ "Altitude in meters","gsm_a.gad.altitude",
+		FT_UINT16,BASE_DEC, NULL, 0x7fff,          
+		"Altitude", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_inner_radius,
+		{ "Inner radius","gsm_a.gad.altitude",
+		FT_UINT16,BASE_DEC, NULL, 0x0,          
+		"Inner radius", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_uncertainty_radius,
+		{ "Uncertainty radius","gsm_a.gad.no_of_points",
+		FT_UINT8,BASE_DEC, NULL, 0x7f,          
+		"Uncertainty radius", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_offset_angle,
+		{ "Offset angle","gsm_a.gad.offset_angle",
+		FT_UINT8,BASE_DEC, NULL, 0x0,          
+		"Offset angle", HFILL }
+	},
+	{ &hf_gsm_a_geo_loc_included_angle,
+		{ "Included angle","gsm_a.gad.included_angle",
+		FT_UINT8,BASE_DEC, NULL, 0x0,          
+		"Included angle", HFILL }
+	},
 	};
 
 	/* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-gsm_a_common.h b/epan/dissectors/packet-gsm_a_common.h
index b903736cf3..38d23d6f6c 100644
--- a/epan/dissectors/packet-gsm_a_common.h
+++ b/epan/dissectors/packet-gsm_a_common.h
@@ -127,6 +127,9 @@ extern int gsm_a_tap;
 extern gboolean lower_nibble;
 extern packet_info *gsm_a_dtap_pinfo;
 
+/* TS 23 032 */
+void dissect_geographical_description(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
 /* common field values */
 extern int hf_gsm_a_length;
 extern int hf_gsm_a_extension;
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 8c2d0a65ac..b3962645e2 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -57,7 +57,6 @@
 #endif
 
 #include <glib.h>
-#include <math.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
@@ -129,23 +128,6 @@ static int hf_gsm_map_guaranteed_max_brate_ulink = -1;
 static int hf_gsm_map_guaranteed_max_brate_dlink = -1;
 static int hf_gsm_map_GSNAddress_IPv4 = -1;
 static int hf_gsm_map_GSNAddress_IPv6 = -1;
-static int hf_gsm_map_geo_loc_type_of_shape = -1;
-static int hf_gsm_map_geo_loc_sign_of_lat	= -1;
-static int hf_gsm_map_geo_loc_deg_of_lat =-1;
-static int hf_gsm_map_geo_loc_deg_of_long =-1;
-static int hf_gsm_map_geo_loc_uncertainty_code = -1;
-static int hf_gsm_map_geo_loc_uncertainty_semi_major = -1;
-static int hf_gsm_map_geo_loc_uncertainty_semi_minor = -1;
-static int hf_gsm_map_geo_loc_orientation_of_major_axis = -1;
-static int hf_gsm_map_geo_loc_uncertainty_altitude = -1;
-static int hf_gsm_map_geo_loc_confidence = -1;
-static int hf_gsm_map_geo_loc_no_of_points = -1;
-static int hf_gsm_map_geo_loc_D = -1;
-static int hf_gsm_map_geo_loc_altitude = -1;
-static int hf_gsm_map_geo_loc_inner_radius = -1;
-static int hf_gsm_map_geo_loc_uncertainty_radius = -1;
-static int hf_gsm_map_geo_loc_offset_angle = -1;
-static int hf_gsm_map_geo_loc_included_angle = -1;
 static int hf_gsm_map_ranap_service_Handover = -1;
 static int hf_gsm_map_IntegrityProtectionInformation = -1;
 static int hf_gsm_map_EncryptionInformation = -1;
@@ -1391,7 +1373,7 @@ static int hf_gsm_ss_areaEventInfo = -1;          /* AreaEventInfo */
 static int hf_gsm_ss_qoS = -1;                    /* LCS_QoS */
 
 /*--- End of included file: packet-gsm_map-hf.c ---*/
-#line 164 "packet-gsmmap-template.c"
+#line 146 "packet-gsmmap-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_gsm_map = -1;
@@ -1957,7 +1939,7 @@ static gint ett_gsm_ss_LCS_PeriodicLocationCancellationArg = -1;
 
 
 /*--- End of included file: packet-gsm_map-ett.c ---*/
-#line 190 "packet-gsmmap-template.c"
+#line 172 "packet-gsmmap-template.c"
 
 static dissector_table_t	sms_dissector_table;	/* SMS TPDU */
 static dissector_handle_t	data_handle;
@@ -2242,174 +2224,6 @@ static const value_string dir_of_alt_vals[] = {
 	{ 0,	NULL }
 };
 
-
-void
-dissect_geographical_description(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree){
-
-	proto_item *lat_item, *long_item, *major_item, *minor_item, *alt_item;
-	/*proto_tree *subtree; */
-
-	guint8 type_of_shape;
-	guint8 no_of_points;
-	int offset = 0;
-	int length;
-	guint8 value;
-	guint32 value32;
-
-	/*subtree = proto_item_add_subtree(item, ett_gsm_map_geo_desc);*/
-
-	length = tvb_reported_length_remaining(tvb,0);
-	/* Geographical Location 
-	 * The Location Estimate field is composed of 1 or more octets with an internal structure 
-	 * according to section 7 in [23.032].
-	 */
-	proto_tree_add_item(tree, hf_gsm_map_geo_loc_type_of_shape, tvb, 0, 1, FALSE);
-	if (length<2)
-		return;
-	type_of_shape = tvb_get_guint8(tvb,offset)>>4;
-	switch (type_of_shape){
-	case ELLIPSOID_POINT:	
-		/* Ellipsoid Point */
-	case ELLIPSOID_POINT_WITH_UNCERT_CIRC:
-		/* Ellipsoid Point with uncertainty Circle */
-	case ELLIPSOID_POINT_WITH_UNCERT_ELLIPSE:
-		/* Ellipsoid Point with uncertainty Ellipse */
-	case ELLIPSOID_POINT_WITH_ALT:
-		/* Ellipsoid Point with Altitude */
-	case ELLIPSOID_POINT_WITH_ALT_AND_UNCERT_ELLIPSOID:
-		/* Ellipsoid Point with altitude and uncertainty ellipsoid */
-	case ELLIPSOID_ARC:
-		/* Ellipsoid Arc */
-		offset++;
-		if (length<4)
-			return;
-		proto_tree_add_item(tree, hf_gsm_map_geo_loc_sign_of_lat, tvb, offset, 1, FALSE);
-
-		value32 = tvb_get_ntoh24(tvb,offset)&0x7fffff;
-		/* convert degrees (X/0x7fffff) * 90 = degrees */
-		lat_item = proto_tree_add_item(tree, hf_gsm_map_geo_loc_deg_of_lat, tvb, offset, 3, FALSE);
-		proto_item_append_text(lat_item,"(%.5f degrees)", (((double)value32/8388607) * 90));
-		if (length<7)
-			return;
-		offset = offset + 3;
-		value32 = tvb_get_ntoh24(tvb,offset)&0x7fffff;
-		long_item = proto_tree_add_item(tree, hf_gsm_map_geo_loc_deg_of_long, tvb, offset, 3, FALSE);
-		/* (X/0xffffff) *360 = degrees */
-		proto_item_append_text(long_item,"(%.5f degrees)", (((double)value32/16777215) * 360));
-		offset = offset + 3;
-		if(type_of_shape==2){
-			/* Ellipsoid Point with uncertainty Circle */
-			if (length<8)
-				return;
-			/* Uncertainty code */
-			proto_tree_add_item(tree, hf_gsm_map_geo_loc_uncertainty_code, tvb, offset, 1, FALSE);
-		}else if(type_of_shape==3){
-			/* Ellipsoid Point with uncertainty Ellipse */
-			/* Uncertainty semi-major octet 10
-			 * To convert to metres 10*(((1.1)^X)-1) 
-			 */
-			value = tvb_get_guint8(tvb,offset)&0x7f; 
-			major_item = proto_tree_add_item(tree, hf_gsm_map_geo_loc_uncertainty_semi_major, tvb, offset, 1, FALSE);
-			proto_item_append_text(major_item,"(%.1f m)", 10 * (pow(1.1, (double)value) - 1));
-			offset++;
-			/* Uncertainty semi-minor Octet 11
-			 * To convert to metres 10*(((1.1)^X)-1) 
-			 */
-			value = tvb_get_guint8(tvb,offset)&0x7f; 
-			minor_item = proto_tree_add_item(tree, hf_gsm_map_geo_loc_uncertainty_semi_minor, tvb, offset, 1, FALSE);
-			proto_item_append_text(minor_item,"(%.1f m)", 10 * (pow(1.1, (double)value) - 1));
-			offset++;
-			/* Orientation of major axis octet 12
-			 * allowed value from 0-179 to convert 
-			 * to actual degrees multiply by 2.
-			 */
-			value = tvb_get_guint8(tvb,offset)&0x7f;
-			proto_tree_add_uint(tree, hf_gsm_map_geo_loc_orientation_of_major_axis, tvb, offset, 1, value*2);
-			offset++;
-			/* Confidence */
-			proto_tree_add_item(tree, hf_gsm_map_geo_loc_confidence, tvb, offset, 1, FALSE);
-			offset++;
-		}else if(type_of_shape==8){
-			/* Ellipsoid Point with Altitude */
-			/*D: Direction of Altitude */
-			proto_tree_add_item(tree, hf_gsm_map_geo_loc_D, tvb, offset, 1, FALSE);
-			/* Altitude */
-			proto_tree_add_item(tree, hf_gsm_map_geo_loc_altitude, tvb, offset, 2, FALSE);
-		}else if(type_of_shape==9){
-			/* Ellipsoid Point with altitude and uncertainty ellipsoid */
-			/*D: Direction of Altitude octet 8,9 */
-			proto_tree_add_item(tree, hf_gsm_map_geo_loc_D, tvb, offset, 1, FALSE);
-			/* Altitude Octet 8,9*/
-			proto_tree_add_item(tree, hf_gsm_map_geo_loc_altitude, tvb, offset, 2, FALSE);
-			offset = offset +2;
-			/* Uncertainty semi-major octet 10
-			 * To convert to metres 10*(((1.1)^X)-1) 
-			 */
-			value = tvb_get_guint8(tvb,offset)&0x7f; 
-			major_item = proto_tree_add_item(tree, hf_gsm_map_geo_loc_uncertainty_semi_major, tvb, offset, 1, FALSE);
-			proto_item_append_text(major_item,"(%.1f m)", 10 * (pow(1.1, (double)value) - 1));
-			offset++;
-			/* Uncertainty semi-minor Octet 11
-			 * To convert to metres 10*(((1.1)^X)-1) 
-			 */
-			value = tvb_get_guint8(tvb,offset)&0x7f; 
-			minor_item = proto_tree_add_item(tree, hf_gsm_map_geo_loc_uncertainty_semi_minor, tvb, offset, 1, FALSE);
-			proto_item_append_text(minor_item,"(%.1f m)", 10 * (pow(1.1, (double)value) - 1));
-			offset++;
-			/* Orientation of major axis octet 12
-			 * allowed value from 0-179 to convert 
-			 * to actual degrees multiply by 2.
-			 */
-			value = tvb_get_guint8(tvb,offset)&0x7f;
-			proto_tree_add_uint(tree, hf_gsm_map_geo_loc_orientation_of_major_axis, tvb, offset, 1, value*2);
-			offset++;
-			/* Uncertainty Altitude 13
-			 * to convert to metres 45*(((1.025)^X)-1) 
-			 */
-			value = tvb_get_guint8(tvb,offset)&0x7f; 
-			alt_item = proto_tree_add_item(tree, hf_gsm_map_geo_loc_uncertainty_altitude, tvb, offset, 1, FALSE);
-			proto_item_append_text(alt_item,"(%.1f m)", 45 * (pow(1.025, (double)value) - 1));
-			offset++;
-			/* Confidence octet 14
-			 */
-			proto_tree_add_item(tree, hf_gsm_map_geo_loc_confidence, tvb, offset, 1, FALSE);
-		}else if(type_of_shape==10){
-			/* Ellipsoid Arc */
-			/* Inner radius */
-			proto_tree_add_item(tree, hf_gsm_map_geo_loc_inner_radius, tvb, offset, 2, FALSE);
-			offset= offset +2;
-			/* Uncertainty radius */
-			proto_tree_add_item(tree, hf_gsm_map_geo_loc_uncertainty_radius, tvb, offset, 1, FALSE);
-			offset++;
-			/* Offset angle */
-			proto_tree_add_item(tree, hf_gsm_map_geo_loc_offset_angle, tvb, offset, 1, FALSE);
-			offset++;
-			/* Included angle */
-			proto_tree_add_item(tree, hf_gsm_map_geo_loc_included_angle, tvb, offset, 1, FALSE);
-			offset++;
-			/* Confidence */
-			proto_tree_add_item(tree, hf_gsm_map_geo_loc_confidence, tvb, offset, 1, FALSE);
-		}
-
-		break;
-	case POLYGON:					/* Polygon */
-		/* Number of points */
-		no_of_points = tvb_get_guint8(tvb,offset)&0x0f;
-		proto_tree_add_item(tree, hf_gsm_map_geo_loc_no_of_points, tvb, offset, 1, FALSE);
-		/*
-		while ( no_of_points > 0){
-			offset++;
-
-			no_of_points--;
-		}
-		*/
-		break;
-	default:
-		break;
-	}
-
-}
-
 static const value_string gsm_map_cbs_data_coding_scheme_coding_grp_vals[] = {
 	{ 0, "Coding Group 0(Language using the GSM 7 bit default alphabet)" }, 
 	{ 1, "Coding Group 1" }, 
@@ -15692,7 +15506,7 @@ dissect_gsm_ss_LCS_PeriodicLocationCancellationArg(gboolean implicit_tag _U_, tv
 
 
 /*--- End of included file: packet-gsm_map-fn.c ---*/
-#line 910 "packet-gsmmap-template.c"
+#line 724 "packet-gsmmap-template.c"
 
 /* Specific translation for MAP V3 */
 const value_string gsm_map_V1V2_opr_code_strings[] = {
@@ -15905,7 +15719,7 @@ const value_string gsm_map_opr_code_strings[] = {
 	{ 109, "lcs_PeriodicLocationCancellation" },
 
 /*--- End of included file: packet-gsm_map-table.c ---*/
-#line 921 "packet-gsmmap-template.c"
+#line 735 "packet-gsmmap-template.c"
   { 0, NULL }
 };
 static const value_string gsm_map_err_code_string_vals[] = {
@@ -16111,7 +15925,7 @@ static const value_string gsm_map_err_code_string_vals[] = {
 	{ 109, "lcs_PeriodicLocationCancellation" },
 
 /*--- End of included file: packet-gsm_map-table.c ---*/
-#line 925 "packet-gsmmap-template.c"
+#line 739 "packet-gsmmap-template.c"
     { 0, NULL }
 };
 static const true_false_string gsm_map_extension_value = {
@@ -17688,92 +17502,6 @@ void proto_register_gsm_map(void) {
       { "GSN Address IPv6",  "gsm_map.gsnaddress_ipv6",
 	  FT_IPv4, BASE_NONE, NULL, 0,
 	  "IPAddress IPv6", HFILL }},
-	{ &hf_gsm_map_geo_loc_type_of_shape,
-		{ "Location estimate","gsm_map.gad.location_estimate",
-		FT_UINT8,BASE_DEC, VALS(type_of_shape_vals), 0xf0,          
-		"Location estimate", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_sign_of_lat,
-		{ "Sign of latitude","gsm_map.gad.sign_of_latitude",
-		FT_UINT8,BASE_DEC, VALS(sign_of_latitude_vals), 0x80,          
-		"Sign of latitude", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_deg_of_lat,
-		{ "Degrees of latitude","gsm_map.gad.sign_of_latitude",
-		FT_UINT24,BASE_DEC, NULL, 0x7fffff,          
-		"Degrees of latitude", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_deg_of_long,
-		{ "Degrees of longitude","gsm_map.gad.sign_of_longitude",
-		FT_UINT24,BASE_DEC, NULL, 0xffffff,          
-		"Degrees of longitude", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_uncertainty_code,
-		{ "Uncertainty code","gsm_map.gad.uncertainty_code",
-		FT_UINT8,BASE_DEC, NULL, 0x7f,          
-		"Uncertainty code", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_uncertainty_semi_major,
-		{ "Uncertainty semi-major","gsm_map.gad.uncertainty_semi_major",
-		FT_UINT8,BASE_DEC, NULL, 0x7f,          
-		"Uncertainty semi-major", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_uncertainty_semi_minor,
-		{ "Uncertainty semi-minor","gsm_map.gad.uncertainty_semi_minor",
-		FT_UINT8,BASE_DEC, NULL, 0x7f,          
-		"Uncertainty semi-minor", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_orientation_of_major_axis,
-		{ "Orientation of major axis","gsm_map.gad.orientation_of_major_axis",
-		FT_UINT8,BASE_DEC, NULL, 0x0,          
-		"Orientation of major axis", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_uncertainty_altitude,
-		{ "Uncertainty Altitude","gsm_map.gad.uncertainty_altitude",
-		FT_UINT8,BASE_DEC, NULL, 0x7f,          
-		"Uncertainty Altitude", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_confidence,
-		{ "Confidence(%)","gsm_map.gad.confidence",
-		FT_UINT8,BASE_DEC, NULL, 0x7f,          
-		"Confidence(%)", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_no_of_points,
-		{ "Number of points","gsm_map.gad.no_of_points",
-		FT_UINT8,BASE_DEC, NULL, 0x0f,          
-		"Number of points", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_D,
-		{ "D: Direction of Altitude","gsm_map.gad.D",
-		FT_UINT16,BASE_DEC, VALS(dir_of_alt_vals), 0x8000,          
-		"D: Direction of Altitude", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_altitude,
-		{ "Altitude in meters","gsm_map.gad.altitude",
-		FT_UINT16,BASE_DEC, NULL, 0x7fff,          
-		"Altitude", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_inner_radius,
-		{ "Inner radius","gsm_map.gad.altitude",
-		FT_UINT16,BASE_DEC, NULL, 0x0,          
-		"Inner radius", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_uncertainty_radius,
-		{ "Uncertainty radius","gsm_map.gad.no_of_points",
-		FT_UINT8,BASE_DEC, NULL, 0x7f,          
-		"Uncertainty radius", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_offset_angle,
-		{ "Offset angle","gsm_map.gad.offset_angle",
-		FT_UINT8,BASE_DEC, NULL, 0x0,          
-		"Offset angle", HFILL }
-	},
-	{ &hf_gsm_map_geo_loc_included_angle,
-		{ "Included angle","gsm_map.gad.included_angle",
-		FT_UINT8,BASE_DEC, NULL, 0x0,          
-		"Included angle", HFILL }
-	},
-
     { &hf_gsm_map_ranap_service_Handover,
       { "service-Handover", "gsm_map.ranap.service_Handover",
         FT_UINT32, BASE_DEC, VALS(ranap_Service_Handover_vals), 0,
@@ -22607,7 +22335,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.LCS_QoS", HFILL }},
 
 /*--- End of included file: packet-gsm_map-hfarr.c ---*/
-#line 2685 "packet-gsmmap-template.c"
+#line 2413 "packet-gsmmap-template.c"
   };
 
   /* List of subtrees */
@@ -23175,7 +22903,7 @@ void proto_register_gsm_map(void) {
 
 
 /*--- End of included file: packet-gsm_map-ettarr.c ---*/
-#line 2713 "packet-gsmmap-template.c"
+#line 2441 "packet-gsmmap-template.c"
   };
 
   /* Register protocol */
@@ -23251,7 +22979,7 @@ void proto_register_gsm_map(void) {
 
 
 /*--- End of included file: packet-gsm_map-dis-tab.c ---*/
-#line 2731 "packet-gsmmap-template.c"
+#line 2459 "packet-gsmmap-template.c"
   oid_add_from_string("ericsson-gsm-Map-Ext","1.2.826.0.1249.58.1.0" );
   oid_add_from_string("accessTypeNotAllowed-id","1.3.12.2.1107.3.66.1.2");
   /*oid_add_from_string("map-ac networkLocUp(1) version3(3)","0.4.0.0.1.0.1.3" );
diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h
index 082759ace7..bba9cc9945 100644
--- a/epan/dissectors/packet-gsm_map.h
+++ b/epan/dissectors/packet-gsm_map.h
@@ -54,8 +54,6 @@ typedef struct _gsm_map_tap_rec_t {
 WS_VAR_IMPORT const value_string gsm_map_opr_code_strings[];
 char* unpack_digits(tvbuff_t *tvb, int offset);
 
-void dissect_geographical_description(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-
 extern const value_string ssCode_vals[];
 extern const value_string gsm_map_PDP_Type_Organisation_vals[];
 extern const value_string gsm_map_ietf_defined_pdp_vals[];
@@ -167,7 +165,7 @@ int dissect_gsm_old_SecurityHeader(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 int dissect_gsm_old_ProtectedPayload(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 
 /*--- End of included file: packet-gsm_map-exp.h ---*/
-#line 59 "packet-gsmmap-template.h"
+#line 57 "packet-gsmmap-template.h"
 
 
 #endif  /* PACKET_GSM_MAP_H */
diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c
index 808bd2e957..aaae7b4378 100644
--- a/epan/dissectors/packet-rrlp.c
+++ b/epan/dissectors/packet-rrlp.c
@@ -48,7 +48,7 @@
 
 #include "packet-ber.h"
 #include "packet-per.h"
-#include "packet-gsm_map.h"
+#include "packet-gsm_a_common.h"
 
 #define PNAME  "Radio Resource LCS Protocol (RRLP)"
 #define PSNAME "RRLP"