From f4a685fa168e00bad969693c8137778c980d535f Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Thu, 5 Dec 2013 16:02:01 +0000
Subject: [PATCH] - Fix build for standalone NAS
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4618 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair-cn/NAS/EURECOM-NAS/src/emm/Attach.c | 4 ++--
openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cn.c | 3 +++
openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cn.h | 2 ++
openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cnDef.h | 4 +++-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/openair-cn/NAS/EURECOM-NAS/src/emm/Attach.c b/openair-cn/NAS/EURECOM-NAS/src/emm/Attach.c
index 4161bed1d5..6617526459 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/emm/Attach.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/emm/Attach.c
@@ -1962,9 +1962,9 @@ static int _emm_attach_identify(void *args)
auth_vector_t *auth = &emm_ctx->vector;
const OctetString loc_rand = {AUTH_RAND_SIZE, (uint8_t *)auth->rand};
const OctetString autn = {AUTH_AUTN_SIZE, (uint8_t *)auth->autn};
- rc = emm_proc_authentication(emm_ctx->ueid, 0, // TODO: eksi != 0
+ rc = emm_proc_authentication(emm_ctx, emm_ctx->ueid, 0, // TODO: eksi != 0
&loc_rand, &autn,
- emm_attach_security,
+ _emm_attach_security,
_emm_attach_release,
_emm_attach_release);
if (rc != RETURNok) {
diff --git a/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cn.c b/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cn.c
index ffd9e6fb17..090a94584c 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cn.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cn.c
@@ -20,6 +20,8 @@ Description
#include <string.h>
+#if defined(EPC_BUILD)
+
#include "nas_log.h"
#include "commonDef.h"
@@ -132,3 +134,4 @@ int emm_cn_send(const emm_cn_t *msg)
LOG_FUNC_RETURN (rc);
}
+#endif
diff --git a/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cn.h b/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cn.h
index 143fc77e34..b65e9890b2 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cn.h
+++ b/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cn.h
@@ -23,6 +23,8 @@ Description
#ifndef _EMM_CN_H_
#define _EMM_CN_H_
+#if defined(EPC_BUILD)
int emm_cn_send(const emm_cn_t *msg);
+#endif
#endif /* _EMM_CN_H_ */
diff --git a/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cnDef.h b/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cnDef.h
index 577d5c403a..77041967c6 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cnDef.h
+++ b/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_cnDef.h
@@ -18,7 +18,9 @@ Description
*****************************************************************************/
+#if defined(EPC_BUILD)
#include "intertask_interface.h"
+#endif
#ifndef __EMM_CNDEF_H__
#define __EMM_CNDEF_H__
@@ -32,10 +34,10 @@ typedef enum emmcn_primitive_s {
_EMMCN_END
} emm_cn_primitive_t;
+#if defined(EPC_BUILD)
typedef nas_auth_param_rsp_t emm_cn_auth_res_t;
typedef nas_auth_param_fail_t emm_cn_auth_fail_t;
-#if defined(EPC_BUILD)
typedef struct emm_mme_ul_s {
emm_cn_primitive_t primitive;
union {
--
GitLab