diff --git a/openair2/F1AP/CU_F1AP.c b/openair2/F1AP/CU_F1AP.c
index 4b5f7b942c135807e2948e2c25f6937f9deae118..72cc6637316029c0274f5fc317cefaf9eeb2c9e9 100644
--- a/openair2/F1AP/CU_F1AP.c
+++ b/openair2/F1AP/CU_F1AP.c
@@ -33,6 +33,9 @@
#include "conversions.h"
#include "f1ap_common.h"
#include "f1ap_messages_types.h"
+#include "f1ap_encoder.h"
+#include "f1ap_decoder.h"
+#include "sctp_cu.h"
#include "platform_types.h"
#include "log.h"
diff --git a/openair2/F1AP/DU_F1AP.c b/openair2/F1AP/DU_F1AP.c
index 35ae157691e1735d175addb480586f5eb02a62ca..d04312251d0879627ab3c24c55cc02271c86d31e 100644
--- a/openair2/F1AP/DU_F1AP.c
+++ b/openair2/F1AP/DU_F1AP.c
@@ -35,8 +35,7 @@
#include "f1ap_messages_types.h"
#include "platform_types.h"
#include "common/utils/LOG/log.h"
-
-
+#include "sctp_du.h"
/* This structure describes association of a DU to a CU */
diff --git a/openair2/F1AP/f1ap_common.h b/openair2/F1AP/f1ap_common.h
index fb33333a419136c420455efc62a302a5fd281c81..0bfc65bc4dd9c42caa35bacc2bfcd79756234b30 100644
--- a/openair2/F1AP/f1ap_common.h
+++ b/openair2/F1AP/f1ap_common.h
@@ -416,7 +416,7 @@ typedef struct f1ap_net_ip_address_s {
typedef int (*f1ap_message_decoded_callback)(
uint32_t assoc_id,
uint32_t stream,
- struct f1ap_message_s *message_p
+ F1AP_F1AP_PDU_t *message_p
);
/** \brief Encode a successfull outcome message
diff --git a/openair2/F1AP/f1ap_decoder.c b/openair2/F1AP/f1ap_decoder.c
index fa861915f424c80216ec39702def8ed072288733..3be1013b4100bb6580de33047dd10b3957c1bf9b 100644
--- a/openair2/F1AP/f1ap_decoder.c
+++ b/openair2/F1AP/f1ap_decoder.c
@@ -134,8 +134,7 @@ static int f1ap_eNB_decode_unsuccessful_outcome(F1AP_F1AP_PDU_t *pdu)
return 0;
}
-int f1ap_decode_pdu(F1AP_F1AP_PDU_t *pdu, const uint8_t *const buffer,
- const uint32_t length)
+int f1ap_decode_pdu(F1AP_F1AP_PDU_t *pdu, const uint8_t *const buffer, uint32_t length)
{
asn_dec_rval_t dec_ret;
diff --git a/openair2/F1AP/f1ap_decoder.h b/openair2/F1AP/f1ap_decoder.h
index c16e880c3329c13e787bb9b1ff054eacd229f571..c8522d6ca5f68264617d97fadbc59ef64232923b 100644
--- a/openair2/F1AP/f1ap_decoder.h
+++ b/openair2/F1AP/f1ap_decoder.h
@@ -33,7 +33,9 @@
#ifndef F1AP_ENB_ENCODER_H_
#define F1AP_ENB_ENCODER_H_
-int f1ap_eNB_encode_pdu(F1AP_F1AP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
+#include "f1ap_common.h"
+
+int f1ap_decode_pdu(F1AP_F1AP_PDU_t *pdu, const uint8_t *const buffer, uint32_t length)
__attribute__ ((warn_unused_result));
#endif /* F1AP_ENB_ENCODER_H_ */
diff --git a/openair2/F1AP/f1ap_encoder.h b/openair2/F1AP/f1ap_encoder.h
index d926497aa5d76ba913ccc3f634bed10c490d0aeb..682395890a3de596cb491e56a6b4ae8cdab60f83 100644
--- a/openair2/F1AP/f1ap_encoder.h
+++ b/openair2/F1AP/f1ap_encoder.h
@@ -33,7 +33,9 @@
#ifndef F1AP_ENCODER_H_
#define F1AP_ENCODER_H_
-int f1ap_encode_pdu(f1ap_message *message, uint8_t **buffer, uint32_t *len)
+#include "f1ap_common.h"
+
+int f1ap_encode_pdu(F1AP_F1AP_PDU_t *message, uint8_t **buffer, uint32_t *len)
__attribute__ ((warn_unused_result));
#endif /* F1AP_ENCODER_H_ */
diff --git a/openair2/F1AP/sctp_cu.c b/openair2/F1AP/sctp_cu.c
index 29f8e93c8ca002047698b0960417e74f61913067..4e9dd98a994a3308fd26e25ddd9c1682d56003d3 100644
--- a/openair2/F1AP/sctp_cu.c
+++ b/openair2/F1AP/sctp_cu.c
@@ -89,9 +89,10 @@ void *recv_func(void *cfd) {
}
printf("ret = %d\n", ret);
close( *(int*)cfd );
+ return NULL;
}
-int sctp_cu_init() {
+int sctp_cu_init(void) {
pthread_t threads;
printf("S - Waiting for socket_accept\n");
@@ -124,4 +125,4 @@ int sctp_cu_init() {
printf("S - close\n");
return 0;
-}
\ No newline at end of file
+}
diff --git a/openair2/F1AP/sctp_cu.h b/openair2/F1AP/sctp_cu.h
new file mode 100644
index 0000000000000000000000000000000000000000..68db2864d572edac674c69613126a663d07538bf
--- /dev/null
+++ b/openair2/F1AP/sctp_cu.h
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+/*! \file sctp_cu.h
+ * \brief sctp server procedures for F1AP
+ * \author Robert Schmidt
+ * \date 2018
+ * \version 0.1
+ * \company Eurecom
+ * \email: robert.schmidt@eurecom.fr
+ * \note
+ * \warning
+ */
+
+#ifndef SCTP_CU_H_
+#define SCTP_CU_H_
+
+//void send_func(int cfd);
+//void *recv_func(void *cfd);
+int sctp_cu_init(void);
+
+#endif /* SCTP_CU_H_ */
diff --git a/openair2/F1AP/sctp_du.h b/openair2/F1AP/sctp_du.h
new file mode 100644
index 0000000000000000000000000000000000000000..b8f2dc06358bc25f87a9cb43437918215dc5b9d9
--- /dev/null
+++ b/openair2/F1AP/sctp_du.h
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+/*! \file sctp_du.h
+ * \brief sctp server procedures for F1AP
+ * \author Robert Schmidt
+ * \date 2018
+ * \version 0.1
+ * \company Eurecom
+ * \email: robert.schmidt@eurecom.fr
+ * \note
+ * \warning
+ */
+
+#ifndef SCTP_DU_H_
+#define SCTP_DU_H_
+
+//void f1ap_du_send_message(uint8_t *buffer_send, uint32_t length);
+//void *send_func(void *argument);
+//void *recv_func(void *argument);
+int sctp_du_init(void);
+
+
+#endif /* SCTP_DU_H_ */