Removed duplicated "as_message.h" from "openair-cn/COMMON" file and updated "Makefile.am" files

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

openair-cn/GTPV1-U/Makefile.am

 AM_CFLAGS = @ADD_CFLAGS@ 	\
 	-I$(top_srcdir)/COMMON	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/include	\
 	-I$(top_srcdir)/INTERTASK_INTERFACE	\
 	-I$(top_srcdir)/GTPV1-U/nw-gtpv1u/include	\
 	-I$(top_srcdir)/GTPV1-U/nw-gtpv1u/shared	\

openair-cn/MME_APP/Makefile.am

 AM_CFLAGS =				\
 	@ADD_CFLAGS@ 			\
 	-I$(top_srcdir)/COMMON	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/include	\
 	-I$(top_srcdir)/INTERTASK_INTERFACE	\
 	-I$(top_srcdir)/S1AP		\
 	-I$(top_srcdir)/S6A	\

openair-cn/Makefile.am

 ACLOCAL_AMFLAGS = -I m4
 
-AM_CFLAGS = @ADD_CFLAGS@ 	\
-	-I$(top_srcdir)/COMMON	\
-	-I$(top_srcdir)/UTILS	\
+AM_CFLAGS = @ADD_CFLAGS@ 							\
+	-I$(top_srcdir)/COMMON							\
+	-I$(top_srcdir)/UTILS							\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/include		\
 	-I$(top_srcdir)/INTERTASK_INTERFACE
 
 if HAVE_GCCXML
@@ -10,15 +12,15 @@ BUILT_SOURCES =		\
 	messages.xml	\
 	messages_xml.h
 
-messages_hdr =	 									\
-	$(top_srcdir)/INTERTASK_INTERFACE/intertask_messages_def.h			\
-	$(top_srcdir)/INTERTASK_INTERFACE/timer_messages_def.h				\
-	$(top_srcdir)/INTERTASK_INTERFACE/timer_messages_types.h			\
-	$(top_srcdir)/COMMON/tasks_def.h						\
-	$(top_srcdir)/COMMON/messages_def.h						\
+messages_hdr =	 												\
+	$(top_srcdir)/INTERTASK_INTERFACE/intertask_messages_def.h	\
+	$(top_srcdir)/INTERTASK_INTERFACE/timer_messages_def.h		\
+	$(top_srcdir)/INTERTASK_INTERFACE/timer_messages_types.h	\
+	$(top_srcdir)/COMMON/tasks_def.h							\
+	$(top_srcdir)/COMMON/messages_def.h							\
 	$(top_srcdir)/COMMON/messages_types.h						\
 	$(top_srcdir)/COMMON/gtpv1_u_messages_def.h					\
-	$(top_srcdir)/COMMON/gtpv1_u_messages_types.h					\
+	$(top_srcdir)/COMMON/gtpv1_u_messages_types.h				\
 	$(top_srcdir)/COMMON/nas_messages_def.h						\
 	$(top_srcdir)/COMMON/nas_messages_types.h					\
 	$(top_srcdir)/COMMON/s11_messages_def.h						\
@@ -27,8 +29,8 @@ messages_hdr =	 									\
 	$(top_srcdir)/COMMON/s1ap_messages_types.h					\
 	$(top_srcdir)/COMMON/s6a_messages_def.h						\
 	$(top_srcdir)/COMMON/s6a_messages_types.h					\
-	$(top_srcdir)/COMMON/sgw_lite_def.h						\
-	$(top_srcdir)/COMMON/sgw_lite_messages_types.h					\
+	$(top_srcdir)/COMMON/sgw_lite_def.h							\
+	$(top_srcdir)/COMMON/sgw_lite_messages_types.h				\
 	$(top_srcdir)/COMMON/sctp_messages_def.h					\
 	$(top_srcdir)/COMMON/sctp_messages_types.h					\
 	$(top_srcdir)/COMMON/udp_messages_def.h						\
@@ -41,23 +43,23 @@ messages_xml.h: messages.xml
 	sed -e 's/[ ]*//' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/"/' messages.xml > messages_xml.h
 endif
 
-SUBDIRS = 			\
-	.			\
-	GTPV1-U			\
-	GTPV2-C			\
-	INTERTASK_INTERFACE 	\
-	SGI			\
-	NAS			\
-	SCTP			\
-	S11			\
-	S1AP			\
-	S6A		        \
-	SECU			\
-	SGW-LITE		\
-	UTILS			\
-	UDP			\
-	MME_APP			\
-	TEST			\
-	OAISIM_MME		\
-	OAI_EPC			\
+SUBDIRS = 				\
+	.					\
+	GTPV1-U				\
+	GTPV2-C				\
+	INTERTASK_INTERFACE \
+	SGI					\
+	NAS					\
+	SCTP				\
+	S11					\
+	S1AP				\
+	S6A		        	\
+	SECU				\
+	SGW-LITE			\
+	UTILS				\
+	UDP					\
+	MME_APP				\
+	TEST				\
+	OAISIM_MME			\
+	OAI_EPC				\
 	OAI_SGW
\ No newline at end of file

openair-cn/NAS/EURECOM-NAS/src/api/network/as_message.h

@@ -96,6 +96,17 @@ Description	Defines the messages supported by the Access Stratum sublayer
 #define AS_RAB_RELEASE_REQ		(AS_RAB_RELEASE | AS_REQUEST)
 #define AS_RAB_RELEASE_IND		(AS_RAB_RELEASE | AS_INDICATION)
 
+/* NAS Cause */
+#define EPS_SERVICES_AND_NON_EPS_SERVICES_NOT_ALLOWED (8)
+#define EPS_SERVICES_NOT_ALLOWED                      (7)
+#define PLMN_NOT_ALLOWED                              (11)
+#define TRACKING_AREA_NOT_ALLOWED                     (12)
+#define ROAMING_NOT_ALLOWED_IN_THIS_TRACKING_AREA     (13)
+#define EPS_SERVICES_NOT_ALLOWED_IN_THIS_PLMN         (14)
+#define NO_SUITABLE_CELLS_IN_TRACKING_AREA            (15)
+#define NETWORK_FAILURE                               (17)
+#define ESM_FAILURE                                   (19)
+
 /*
  * --------------------------------------------------------------------------
  * 		    Access Stratum message global parameters

openair-cn/OAI_EPC/Makefile.am

@@ -5,6 +5,8 @@ AM_CFLAGS = @ADD_CFLAGS@ \
 	-I$(top_srcdir)/GTPV1-U/nw-gtpv1u/include	\
 	-I$(top_srcdir)/GTPV1-U/nw-gtpv1u/shared		\
 	-I$(top_srcdir)/SCTP				\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/include	\
 	-I$(top_srcdir)/INTERTASK_INTERFACE		\
 	-I$(top_srcdir)/SGI				\
 	-I$(top_srcdir)/MME_APP				\

openair-cn/S11/Makefile.am

@@ -6,6 +6,8 @@ AM_CFLAGS =	\
 	@ADD_CFLAGS@	\
 	-I$(top_srcdir)/COMMON	\
 	-I$(top_srcdir)/GTPV2-C/nwgtpv2c-0.11/shared	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/include	\
 	-I$(top_srcdir)/INTERTASK_INTERFACE	\
 	-I$(top_srcdir)/SGW-LITE	\
 	-I$(top_srcdir)/UTILS

openair-cn/S1AP/Makefile.am

@@ -5,6 +5,8 @@ AM_CFLAGS =				\
 	-I$(top_srcdir)/COMMON	\
 	-I$(top_builddir)/S1AP		\
 	-I$(top_builddir)/S1AP/MESSAGES	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/include	\
 	-I$(top_srcdir)/INTERTASK_INTERFACE	\
 	-I$(top_srcdir)/SCTP	\
 	-I$(top_srcdir)/UTILS	\

openair-cn/S6A/Makefile.am

 AM_CFLAGS =				\
 	@ADD_CFLAGS@ 			\
 	-I$(top_srcdir)/COMMON   \
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/include	\
 	-I$(top_srcdir)/INTERTASK_INTERFACE	\
 	-I$(top_srcdir)/UTILS
 

openair-cn/SCTP/Makefile.am

@@ -5,6 +5,8 @@ libsctpserver_la_LDFLAGS = -all-static
 AM_CFLAGS =	\
 	@ADD_CFLAGS@	\
 	-I$(top_srcdir)/COMMON	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/include	\
 	-I$(top_srcdir)/INTERTASK_INTERFACE	\
 	-I$(top_srcdir)/UTILS
 

openair-cn/SGI/Makefile.am

@@ -3,6 +3,8 @@ AM_CFLAGS = @ADD_CFLAGS@ 	\
     -I$(top_srcdir)/SGW-LITE  \
     -I$(top_srcdir)/UTILS   \
     -I$(top_srcdir)/UTILS/HASHTABLE   \
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/include	\
     -I$(top_srcdir)/INTERTASK_INTERFACE 
     
 noinst_LTLIBRARIES = libsgi.la

openair-cn/SGW-LITE/Makefile.am

 AM_CFLAGS = @ADD_CFLAGS@ \
 	-I$(top_srcdir)/COMMON	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/include	\
     -I$(top_srcdir)/INTERTASK_INTERFACE \
     -I$(top_srcdir)/MME_APP \
     -I$(top_srcdir)/UTILS \

openair-cn/UDP/Makefile.am

@@ -4,6 +4,8 @@ libudpserver_la_LDFLAGS = -all-static
 AM_CFLAGS =	\
 	@ADD_CFLAGS@	\
 	-I$(top_srcdir)/COMMON	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network	\
+	-I$(top_srcdir)/NAS/EURECOM-NAS/src/include	\
 	-I$(top_srcdir)/INTERTASK_INTERFACE	\
 	-I$(top_srcdir)/UTILS