acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[PFCP] xact: avoid exporting internal (#1329)

This commit is contained in:
Sukchan Lee 2022-01-19 20:03:28 +09:00
parent ed3a3a527a
commit 776892e09d
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/gtp/xact.c
View File

@ -32,11 +32,11 @@ static uint32_t g_xact_id = 0;
static OGS_POOL(pool, ogs_gtp_xact_t);
static ogs_gtp_xact_t *ogs_gtp_xact_remote_create(ogs_gtp_node_t *gnode, uint32_t sqn);
static ogs_gtp_xact_t *ogs_gtp_xact_remote_create(
ogs_gtp_node_t *gnode, uint32_t sqn);
static ogs_gtp_xact_stage_t ogs_gtp_xact_get_stage(uint8_t type, uint32_t sqn);
static int ogs_gtp_xact_delete(ogs_gtp_xact_t *xact);
static int ogs_gtp_xact_update_rx(ogs_gtp_xact_t *xact, uint8_t type);
static ogs_gtp_xact_t *ogs_gtp_xact_find(ogs_index_t index);
static ogs_gtp_xact_t *ogs_gtp_xact_find_by_xid(
ogs_gtp_node_t *gnode, uint8_t type, uint32_t xid);
@ -122,7 +122,8 @@ ogs_gtp_xact_t *ogs_gtp_xact_local_create(ogs_gtp_node_t *gnode,
return xact;
}
static ogs_gtp_xact_t *ogs_gtp_xact_remote_create(ogs_gtp_node_t *gnode, uint32_t sqn)
static ogs_gtp_xact_t *ogs_gtp_xact_remote_create(
ogs_gtp_node_t *gnode, uint32_t sqn)
{
char buf[OGS_ADDRSTRLEN];
ogs_gtp_xact_t *xact = NULL;

25
lib/pfcp/xact.c
View File

@ -35,9 +35,15 @@ static uint32_t g_xact_id = 0;
static OGS_POOL(pool, ogs_pfcp_xact_t);
static ogs_pfcp_xact_t *ogs_pfcp_xact_remote_create(
ogs_pfcp_node_t *node, uint32_t sqn);
static ogs_pfcp_xact_stage_t ogs_pfcp_xact_get_stage(
uint8_t type, uint32_t sqn);
static int ogs_pfcp_xact_delete(ogs_pfcp_xact_t *xact);
static int ogs_pfcp_xact_update_rx(ogs_pfcp_xact_t *xact, uint8_t type);
static ogs_pfcp_xact_t *ogs_pfcp_xact_find_by_xid(
ogs_pfcp_node_t *node, uint8_t type, uint32_t xid);
static void response_timeout(void *data);
static void holding_timeout(void *data);
@ -100,7 +106,7 @@ ogs_pfcp_xact_t *ogs_pfcp_xact_local_create(ogs_pfcp_node_t *node,
ogs_app()->timer_mgr, delayed_commit_timeout, xact);
ogs_assert(xact->tm_delayed_commit);
ogs_list_add(xact->org == OGS_PFCP_LOCAL_ORIGINATOR ?
ogs_list_add(xact->org == OGS_PFCP_LOCAL_ORIGINATOR ?
&xact->node->local_list : &xact->node->remote_list, xact);
rv = ogs_pfcp_xact_update_tx(xact, hdesc, pkbuf);
@ -119,7 +125,7 @@ ogs_pfcp_xact_t *ogs_pfcp_xact_local_create(ogs_pfcp_node_t *node,
return xact;
}
ogs_pfcp_xact_t *ogs_pfcp_xact_remote_create(
static ogs_pfcp_xact_t *ogs_pfcp_xact_remote_create(
ogs_pfcp_node_t *node, uint32_t sqn)
{
char buf[OGS_ADDRSTRLEN];
@ -150,7 +156,7 @@ ogs_pfcp_xact_t *ogs_pfcp_xact_remote_create(
ogs_app()->timer_mgr, delayed_commit_timeout, xact);
ogs_assert(xact->tm_delayed_commit);
ogs_list_add(xact->org == OGS_PFCP_LOCAL_ORIGINATOR ?
ogs_list_add(xact->org == OGS_PFCP_LOCAL_ORIGINATOR ?
&xact->node->local_list : &xact->node->remote_list, xact);
ogs_debug("[%d] %s Create peer [%s]:%d",
@ -184,7 +190,7 @@ int ogs_pfcp_xact_update_tx(ogs_pfcp_xact_t *xact,
ogs_pfcp_xact_stage_t stage;
ogs_pfcp_header_t *h = NULL;
int pfcp_hlen = 0;
ogs_assert(xact);
ogs_assert(xact->node);
ogs_assert(hdesc);
@ -285,7 +291,7 @@ int ogs_pfcp_xact_update_tx(ogs_pfcp_xact_t *xact,
return OGS_OK;
}
int ogs_pfcp_xact_update_rx(ogs_pfcp_xact_t *xact, uint8_t type)
static int ogs_pfcp_xact_update_rx(ogs_pfcp_xact_t *xact, uint8_t type)
{
int rv = OGS_OK;
char buf[OGS_ADDRSTRLEN];
@ -466,7 +472,7 @@ int ogs_pfcp_xact_commit(ogs_pfcp_xact_t *xact)
uint8_t type;
ogs_pkbuf_t *pkbuf = NULL;
ogs_pfcp_xact_stage_t stage;
ogs_assert(xact);
ogs_assert(xact->node);
@ -715,11 +721,6 @@ int ogs_pfcp_xact_receive(
return rv;
}
ogs_pfcp_xact_t *ogs_pfcp_xact_find(ogs_index_t index)
{
return ogs_pool_find(&pool, index);
}
static ogs_pfcp_xact_stage_t ogs_pfcp_xact_get_stage(uint8_t type, uint32_t xid)
{
ogs_pfcp_xact_stage_t stage = PFCP_XACT_UNKNOWN_STAGE;
@ -755,7 +756,7 @@ static ogs_pfcp_xact_stage_t ogs_pfcp_xact_get_stage(uint8_t type, uint32_t xid)
return stage;
}
ogs_pfcp_xact_t *ogs_pfcp_xact_find_by_xid(
static ogs_pfcp_xact_t *ogs_pfcp_xact_find_by_xid(
ogs_pfcp_node_t *node, uint8_t type, uint32_t xid)
{
char buf[OGS_ADDRSTRLEN];

7
lib/pfcp/xact.h
View File

@ -115,14 +115,11 @@ void ogs_pfcp_xact_final(void);
ogs_pfcp_xact_t *ogs_pfcp_xact_local_create(ogs_pfcp_node_t *node,
ogs_pfcp_header_t *hdesc, ogs_pkbuf_t *pkbuf,
void (*cb)(ogs_pfcp_xact_t *xact, void *data), void *data);
ogs_pfcp_xact_t *ogs_pfcp_xact_remote_create(
ogs_pfcp_node_t *node, uint32_t sqn);
ogs_pfcp_xact_t *ogs_pfcp_xact_cycle(ogs_pfcp_xact_t *xact);
void ogs_pfcp_xact_delete_all(ogs_pfcp_node_t *node);
int ogs_pfcp_xact_update_tx(ogs_pfcp_xact_t *xact,
ogs_pfcp_header_t *hdesc, ogs_pkbuf_t *pkbuf);
int ogs_pfcp_xact_update_rx(ogs_pfcp_xact_t *xact, uint8_t type);
int ogs_pfcp_xact_commit(ogs_pfcp_xact_t *xact);
void ogs_pfcp_xact_delayed_commit(ogs_pfcp_xact_t *xact, ogs_time_t duration);
@ -130,10 +127,6 @@ void ogs_pfcp_xact_delayed_commit(ogs_pfcp_xact_t *xact, ogs_time_t duration);
int ogs_pfcp_xact_receive(ogs_pfcp_node_t *node,
ogs_pfcp_header_t *h, ogs_pfcp_xact_t **xact);
ogs_pfcp_xact_t *ogs_pfcp_xact_find(ogs_index_t index);
ogs_pfcp_xact_t *ogs_pfcp_xact_find_by_xid(
ogs_pfcp_node_t *node, uint8_t type, uint32_t xid);
#ifdef __cplusplus
}
#endif