maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SCTP assoc_id: Make it sctp_assoc_t, project-wide

Browse Source
This commit is contained in:
Robert Schmidt
2023-09-22 08:22:15 +02:00
parent f5c90ead7e
commit 3f46a71157
115 changed files with 818 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/COMMON/e1ap_messages_types.h
+3 -1
View File
@@ -24,6 +24,8 @@
#ifndef E1AP_MESSAGES_TYPES_H
#define E1AP_MESSAGES_TYPES_H
#include <netinet/in.h>
#include <netinet/sctp.h>
#include "common/ngran_types.h"
#include "f1ap_messages_types.h"
#include "ngap_messages_types.h"
@@ -55,7 +57,7 @@ typedef struct PLMN_ID_s {
typedef struct e1ap_setup_req_s {
uint64_t gNB_cu_up_id;
char * gNB_cu_up_name;
int assoc_id;
sctp_assoc_t assoc_id;
uint64_t transac_id;
int supported_plmns;
PLMN_ID_t plmns[E1AP_MAX_NUM_PLMNS];
openair2/COMMON/f1ap_messages_types.h
+3 -1
View File
@@ -22,6 +22,8 @@
#ifndef F1AP_MESSAGES_TYPES_H_
#define F1AP_MESSAGES_TYPES_H_
#include <netinet/in.h>
#include <netinet/sctp.h>
#include "rlc.h"
#include "s1ap_messages_types.h"
@@ -194,7 +196,7 @@ typedef struct f1ap_gnb_cu_configuration_update_s {
uint16_t cnx_id;
/* SCTP association id */
int32_t assoc_id;
sctp_assoc_t assoc_id;
/* Number of SCTP streams used for a mme association */
uint16_t sctp_in_streams;
openair2/COMMON/m2ap_messages_types.h
+4 -2
View File
@@ -23,6 +23,8 @@
#ifndef M2AP_MESSAGES_TYPES_H_
#define M2AP_MESSAGES_TYPES_H_
#include <netinet/in.h>
#include <netinet/sctp.h>
#include "s1ap_messages_types.h"
#include "LTE_PhysCellId.h"
@@ -104,7 +106,7 @@ typedef struct m2ap_setup_req_s {
uint16_t cnx_id;
/* SCTP association id */
int32_t assoc_id;
sctp_assoc_t assoc_id;
/* The eNB IP address to bind */
m2ap_net_ip_address_t MCE_M2_ip_address;
@@ -258,7 +260,7 @@ typedef struct m2ap_setup_resp_s {
uint16_t cnx_id;
/* SCTP association id */
int32_t assoc_id;
sctp_assoc_t assoc_id;
/* Number of SCTP streams used for a mme association */
uint16_t sctp_in_streams;
openair2/COMMON/m3ap_messages_types.h
+3 -1
View File
@@ -22,6 +22,8 @@
#ifndef M3AP_MESSAGES_TYPES_H_
#define M3AP_MESSAGES_TYPES_H_
#include <netinet/in.h>
#include <netinet/sctp.h>
#include "s1ap_messages_types.h"
#include "LTE_PhysCellId.h"
@@ -336,7 +338,7 @@ typedef struct m3ap_setup_req_s{
/* Connexion id used between SCTP/M3AP */
uint16_t cnx_id;
/* SCTP association id */
int32_t assoc_id;
sctp_assoc_t assoc_id;
/* Number of SCTP streams used for a mme association */
uint16_t sctp_in_streams;
openair2/COMMON/s1ap_messages_types.h
+2
View File
@@ -22,6 +22,8 @@
#ifndef S1AP_MESSAGES_TYPES_H_
#define S1AP_MESSAGES_TYPES_H_
#include <netinet/in.h>
#include <netinet/sctp.h>
#include "LTE_asn_constant.h"
//-------------------------------------------------------------------------------------------//
// Defines to access message fields.
openair2/COMMON/sctp_messages_types.h
+7 -4
View File
@@ -22,6 +22,9 @@
#ifndef SCTP_MESSAGES_TYPES_H_
#define SCTP_MESSAGES_TYPES_H_
#include <netinet/in.h>
#include <netinet/sctp.h>
#define SCTP_NEW_ASSOCIATION_REQ(mSGpTR) (mSGpTR)->ittiMsg.sctp_new_association_req
#define SCTP_NEW_ASSOCIATION_REQ_MULTI(mSGpTR) (mSGpTR)->ittiMsg.sctp_new_association_req_multi
#define SCTP_NEW_ASSOCIATION_RESP(mSGpTR) (mSGpTR)->ittiMsg.sctp_new_association_resp
@@ -87,7 +90,7 @@ typedef struct sctp_init_msg_multi_cnf_s {
typedef struct sctp_new_association_ind_s {
/* Assoc id of the new association */
int32_t assoc_id;
sctp_assoc_t assoc_id;
/* The port used by remote host */
uint16_t port;
@@ -102,7 +105,7 @@ typedef struct sctp_new_association_resp_s {
uint16_t ulp_cnx_id;
/* SCTP Association ID */
int32_t assoc_id;
sctp_assoc_t assoc_id;
/* Input/output streams */
uint16_t out_streams;
@@ -114,7 +117,7 @@ typedef struct sctp_new_association_resp_s {
typedef struct sctp_data_ind_s {
/* SCTP Association ID */
int32_t assoc_id;
sctp_assoc_t assoc_id;
/* Buffer to send over SCTP */
uint32_t buffer_length;
@@ -139,7 +142,7 @@ typedef struct sctp_init_s {
typedef struct sctp_close_association_s {
uint32_t assoc_id;
sctp_assoc_t assoc_id;
} sctp_close_association_t;
openair2/COMMON/x2ap_messages_types.h
+3 -1
View File
@@ -22,6 +22,8 @@
#ifndef X2AP_MESSAGES_TYPES_H_
#define X2AP_MESSAGES_TYPES_H_
#include <netinet/in.h>
#include <netinet/sctp.h>
#include "s1ap_messages_types.h"
#include "LTE_PhysCellId.h"
@@ -425,7 +427,7 @@ typedef struct x2ap_ENDC_reconf_complete_s {
typedef struct x2ap_ENDC_sgnb_release_request_s {
int rnti;
x2ap_cause_t cause;
int assoc_id;
sctp_assoc_t assoc_id;
} x2ap_ENDC_sgnb_release_request_t;
typedef struct x2ap_ENDC_sgnb_release_required_s {