summaryrefslogtreecommitdiff
path: root/cesar/cp2/conn
diff options
context:
space:
mode:
authorboure2008-06-10 15:38:15 +0000
committerboure2008-06-10 15:38:15 +0000
commit324781102ff6fa84e807b1b83c232732307337d5 (patch)
tree0de6fd392aedeec5297e267d099dd2ef56cad3b2 /cesar/cp2/conn
parentf311fea95746a912d8e3bc331c41c8e91d4fa81e (diff)
Renamed msg related functions
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@2270 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/cp2/conn')
-rw-r--r--cesar/cp2/conn/conn_mgr.h130
-rw-r--r--cesar/cp2/conn/src/conn_mgr.c48
-rw-r--r--cesar/cp2/conn/test/src/msg_stub.c56
3 files changed, 117 insertions, 117 deletions
diff --git a/cesar/cp2/conn/conn_mgr.h b/cesar/cp2/conn/conn_mgr.h
index 99f6392d0c..a10f7a15eb 100644
--- a/cesar/cp2/conn/conn_mgr.h
+++ b/cesar/cp2/conn/conn_mgr.h
@@ -34,7 +34,7 @@ typedef struct cp_conn_mgr_t cp_conn_mgr_t;
/** CONN NEW **/
/****************************/
-struct cp_conn_mgr_mme_cm_conn_new_req_t
+struct cp_msg_cm_conn_new_req_t
{
/** Connection identifier*/
@@ -47,12 +47,12 @@ struct cp_conn_mgr_mme_cm_conn_new_req_t
//cp_classifier_rule_set_t *classifier;
};
-typedef struct cp_conn_mgr_mme_cm_conn_new_req_t cp_conn_mgr_mme_cm_conn_new_req_t;
+typedef struct cp_msg_cm_conn_new_req_t cp_msg_cm_conn_new_req_t;
/**
* Structure of a MME cm_conn_new_cnf
*/
-struct cp_conn_mgr_mme_cm_conn_new_cnf_t
+struct cp_msg_cm_conn_new_cnf_t
{
/** Connection identifier */
@@ -68,14 +68,14 @@ struct cp_conn_mgr_mme_cm_conn_new_cnf_t
cp_conn_cspec_t *proposed_cspec;
};
-typedef struct cp_conn_mgr_mme_cm_conn_new_cnf_t cp_conn_mgr_mme_cm_conn_new_cnf_t;
+typedef struct cp_msg_cm_conn_new_cnf_t cp_msg_cm_conn_new_cnf_t;
/****************************/
/** CONN REL **/
/****************************/
-struct cp_conn_mgr_mme_cm_conn_rel_ind_t
+struct cp_msg_cm_conn_rel_ind_t
{
/** Connection identifier */
@@ -88,22 +88,22 @@ struct cp_conn_mgr_mme_cm_conn_rel_ind_t
cp_conn_cspec_t *violated_cspec;
};
-typedef struct cp_conn_mgr_mme_cm_conn_rel_ind_t cp_conn_mgr_mme_cm_conn_rel_ind_t;
+typedef struct cp_msg_cm_conn_rel_ind_t cp_msg_cm_conn_rel_ind_t;
-struct cp_conn_mgr_mme_cm_conn_rel_rsp_t
+struct cp_msg_cm_conn_rel_rsp_t
{
/** Connection identifier */
u16 cid;
};
-typedef struct cp_conn_mgr_mme_cm_conn_rel_rsp_t cp_conn_mgr_mme_cm_conn_rel_rsp_t;
+typedef struct cp_msg_cm_conn_rel_rsp_t cp_msg_cm_conn_rel_rsp_t;
/****************************/
/** CONN MOD **/
/****************************/
-struct cp_conn_mgr_mme_cm_conn_mod_req_t
+struct cp_msg_cm_conn_mod_req_t
{
/** Connection identifier */
@@ -112,9 +112,9 @@ struct cp_conn_mgr_mme_cm_conn_mod_req_t
/** Modified CSPEC */
cp_conn_cspec_t *modified_cspec;
};
-typedef struct cp_conn_mgr_mme_cm_conn_mod_req_t cp_conn_mgr_mme_cm_conn_mod_req_t;
+typedef struct cp_msg_cm_conn_mod_req_t cp_msg_cm_conn_mod_req_t;
-struct cp_conn_mgr_mme_cm_conn_mod_cnf_t
+struct cp_msg_cm_conn_mod_cnf_t
{
/** Connection identifier */
@@ -127,12 +127,12 @@ struct cp_conn_mgr_mme_cm_conn_mod_cnf_t
cp_conn_cspec_t *proposed_cspec;
};
-typedef struct cp_conn_mgr_mme_cm_conn_mod_cnf_t cp_conn_mgr_mme_cm_conn_mod_cnf_t;
+typedef struct cp_msg_cm_conn_mod_cnf_t cp_msg_cm_conn_mod_cnf_t;
/****************************/
/** CONN INFO **/
/****************************/
-struct cp_conn_mgr_mme_cm_conn_info_req_t
+struct cp_msg_cm_conn_info_req_t
{
/** Request type */
@@ -144,9 +144,9 @@ struct cp_conn_mgr_mme_cm_conn_info_req_t
/** GLID */
u8 glid;
};
-typedef struct cp_conn_mgr_mme_cm_conn_info_req_t cp_conn_mgr_mme_cm_conn_info_req_t;
+typedef struct cp_msg_cm_conn_info_req_t cp_msg_cm_conn_info_req_t;
-struct cp_conn_mgr_mme_cm_conn_info_cnf_t
+struct cp_msg_cm_conn_info_cnf_t
{
/** Number of Connection */
@@ -156,12 +156,12 @@ struct cp_conn_mgr_mme_cm_conn_info_cnf_t
cp_conn_info_t **conn_info;
};
-typedef struct cp_conn_mgr_mme_cm_conn_info_cnf_t cp_conn_mgr_mme_cm_conn_info_cnf_t;
+typedef struct cp_msg_cm_conn_info_cnf_t cp_msg_cm_conn_info_cnf_t;
/****************************/
/** CONN APCM **/
/****************************/
-struct cp_conn_mgr_mme_apcm_conn_add_req_t
+struct cp_msg_apcm_conn_add_req_t
{
/** Original source address */
@@ -180,9 +180,9 @@ struct cp_conn_mgr_mme_apcm_conn_add_req_t
//cp_classifier_rule_set_t *classifier;
};
-typedef struct cp_conn_mgr_mme_apcm_conn_add_req_t cp_conn_mgr_mme_apcm_conn_add_req_t;
+typedef struct cp_msg_apcm_conn_add_req_t cp_msg_apcm_conn_add_req_t;
-struct cp_conn_mgr_mme_apcm_conn_add_cnf_t
+struct cp_msg_apcm_conn_add_cnf_t
{
/** Connection identifier */
@@ -204,9 +204,9 @@ struct cp_conn_mgr_mme_apcm_conn_add_cnf_t
cp_conn_cspec_t *proposed_cspec;
};
-typedef struct cp_conn_mgr_mme_apcm_conn_add_cnf_t cp_conn_mgr_mme_apcm_conn_add_cnf_t;
+typedef struct cp_msg_apcm_conn_add_cnf_t cp_msg_apcm_conn_add_cnf_t;
-struct cp_conn_mgr_mme_apcm_conn_add_ind_t
+struct cp_msg_apcm_conn_add_ind_t
{
/** Connection identifier */
@@ -222,9 +222,9 @@ struct cp_conn_mgr_mme_apcm_conn_add_ind_t
cp_conn_cspec_t *cspec;
};
-typedef struct cp_conn_mgr_mme_apcm_conn_add_ind_t cp_conn_mgr_mme_apcm_conn_add_ind_t;
+typedef struct cp_msg_apcm_conn_add_ind_t cp_msg_apcm_conn_add_ind_t;
-struct cp_conn_mgr_mme_apcm_conn_add_rsp_t
+struct cp_msg_apcm_conn_add_rsp_t
{
/** Connection identifier */
u16 cid;
@@ -236,23 +236,23 @@ struct cp_conn_mgr_mme_apcm_conn_add_rsp_t
cp_conn_cspec_t *cspec;
};
-typedef struct cp_conn_mgr_mme_apcm_conn_add_rsp_t cp_conn_mgr_mme_apcm_conn_add_rsp_t;
+typedef struct cp_msg_apcm_conn_add_rsp_t cp_msg_apcm_conn_add_rsp_t;
-struct cp_conn_mgr_mme_apcm_conn_rel_req_t
+struct cp_msg_apcm_conn_rel_req_t
{
/** Connection identifier */
u16 cid;
};
-typedef struct cp_conn_mgr_mme_apcm_conn_rel_req_t cp_conn_mgr_mme_apcm_conn_rel_req_t;
+typedef struct cp_msg_apcm_conn_rel_req_t cp_msg_apcm_conn_rel_req_t;
-struct cp_conn_mgr_mme_apcm_conn_rel_cnf_t
+struct cp_msg_apcm_conn_rel_cnf_t
{
/** Connection identifier */
u16 cid;
};
-typedef struct cp_conn_mgr_mme_apcm_conn_rel_cnf_t cp_conn_mgr_mme_apcm_conn_rel_cnf_t;
+typedef struct cp_msg_apcm_conn_rel_cnf_t cp_msg_apcm_conn_rel_cnf_t;
-struct cp_conn_mgr_mme_apcm_conn_rel_ind_t
+struct cp_msg_apcm_conn_rel_ind_t
{
/** Connection identifier */
@@ -271,12 +271,12 @@ struct cp_conn_mgr_mme_apcm_conn_rel_ind_t
cp_conn_cspec_t *violated_cspec;
};
-typedef struct cp_conn_mgr_mme_apcm_conn_rel_ind_t cp_conn_mgr_mme_apcm_conn_rel_ind_t;
+typedef struct cp_msg_apcm_conn_rel_ind_t cp_msg_apcm_conn_rel_ind_t;
/**
* Structure of a MME apcm_conn_mod_req
*/
-struct cp_conn_mgr_mme_apcm_conn_mod_req_t
+struct cp_msg_apcm_conn_mod_req_t
{
/** Connection identifier */
@@ -286,12 +286,12 @@ struct cp_conn_mgr_mme_apcm_conn_mod_req_t
cp_conn_cspec_t *cspec;
};
-typedef struct cp_conn_mgr_mme_apcm_conn_mod_req_t cp_conn_mgr_mme_apcm_conn_mod_req_t;
+typedef struct cp_msg_apcm_conn_mod_req_t cp_msg_apcm_conn_mod_req_t;
/**
* Structure of a MME apcm_conn_mod.cnf
*/
-struct cp_conn_mgr_mme_apcm_conn_mod_cnf_t
+struct cp_msg_apcm_conn_mod_cnf_t
{
/** Connection identifier */
@@ -304,12 +304,12 @@ struct cp_conn_mgr_mme_apcm_conn_mod_cnf_t
cp_conn_cspec_t *proposed_cspec;
};
-typedef struct cp_conn_mgr_mme_apcm_conn_mod_cnf_t cp_conn_mgr_mme_apcm_conn_mod_cnf_t;
+typedef struct cp_msg_apcm_conn_mod_cnf_t cp_msg_apcm_conn_mod_cnf_t;
/**
* Structure of a MME apcm_conn_mod.ind
*/
-struct cp_conn_mgr_mme_apcm_conn_mod_ind_t
+struct cp_msg_apcm_conn_mod_ind_t
{
/** Connection identifier */
@@ -322,12 +322,12 @@ struct cp_conn_mgr_mme_apcm_conn_mod_ind_t
u8 cause;
};
-typedef struct cp_conn_mgr_mme_apcm_conn_mod_ind_t cp_conn_mgr_mme_apcm_conn_mod_ind_t;
+typedef struct cp_msg_apcm_conn_mod_ind_t cp_msg_apcm_conn_mod_ind_t;
/**
* Structure of a MME apcm_conn_mod.rsp
*/
-struct cp_conn_mgr_mme_apcm_conn_mod_rsp_t
+struct cp_msg_apcm_conn_mod_rsp_t
{
/** Connection identifier */
@@ -340,7 +340,7 @@ struct cp_conn_mgr_mme_apcm_conn_mod_rsp_t
cp_conn_cspec_t *proposed_cspec;
};
-typedef struct cp_conn_mgr_mme_apcm_conn_mod_rsp_t cp_conn_mgr_mme_apcm_conn_mod_rsp_t;
+typedef struct cp_msg_apcm_conn_mod_rsp_t cp_msg_apcm_conn_mod_rsp_t;
/**
* Process a CM_CONN_NEW_REQ MME
@@ -492,22 +492,22 @@ cp_conn_mgr_uninit(cp_t *ctx);
void
cp_msg_cm_conn_new_req_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_new_req_t *data);
+ cp_msg_cm_conn_new_req_t *data);
bool
cp_msg_cm_conn_new_req_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_new_req_t *data);
+ cp_msg_cm_conn_new_req_t *data);
void
cp_msg_cm_conn_new_cnf_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_new_cnf_t *data);
+ cp_msg_cm_conn_new_cnf_t *data);
bool
cp_msg_cm_conn_new_cnf_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_new_cnf_t *data);
+ cp_msg_cm_conn_new_cnf_t *data);
/*************************/
/*** CONN REL ***/
@@ -516,22 +516,22 @@ cp_msg_cm_conn_new_cnf_receive(cp_t *ctx,
void
cp_msg_cm_conn_rel_ind_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_rel_ind_t *data);
+ cp_msg_cm_conn_rel_ind_t *data);
bool
cp_msg_cm_conn_rel_ind_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_rel_ind_t *data);
+ cp_msg_cm_conn_rel_ind_t *data);
void
cp_msg_cm_conn_rel_rsp_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_rel_rsp_t *data);
+ cp_msg_cm_conn_rel_rsp_t *data);
bool
cp_msg_cm_conn_rel_rsp_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_rel_rsp_t *data);
+ cp_msg_cm_conn_rel_rsp_t *data);
/*************************/
/*** CONN MOD ***/
@@ -540,22 +540,22 @@ cp_msg_cm_conn_rel_rsp_receive(cp_t *ctx,
void
cp_msg_cm_conn_mod_req_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_mod_req_t *data);
+ cp_msg_cm_conn_mod_req_t *data);
bool
cp_msg_cm_conn_mod_req_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_mod_req_t *data);
+ cp_msg_cm_conn_mod_req_t *data);
void
cp_msg_cm_conn_mod_cnf_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_mod_cnf_t *data);
+ cp_msg_cm_conn_mod_cnf_t *data);
bool
cp_msg_cm_conn_mod_cnf_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_mod_cnf_t *data);
+ cp_msg_cm_conn_mod_cnf_t *data);
/*************************/
/*** CONN INFO ***/
@@ -563,20 +563,20 @@ cp_msg_cm_conn_mod_cnf_receive(cp_t *ctx,
void
cp_msg_cm_conn_info_req_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_info_req_t *data);
+ cp_msg_cm_conn_info_req_t *data);
bool
cp_msg_cm_conn_info_req_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_info_req_t *data);
+ cp_msg_cm_conn_info_req_t *data);
void
cp_msg_cm_conn_info_cnf_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_info_cnf_t *data);
+ cp_msg_cm_conn_info_cnf_t *data);
bool
cp_msg_cm_conn_info_cnf_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_info_cnf_t *data);
+ cp_msg_cm_conn_info_cnf_t *data);
/*************************/
/*** APCM Family ***/
/*************************/
@@ -588,21 +588,21 @@ cp_msg_cm_conn_info_cnf_receive(cp_t *ctx,
bool
cp_msg_apcm_conn_add_req_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_add_req_t *data);
+ cp_msg_apcm_conn_add_req_t *data);
void
cp_msg_apcm_conn_add_cnf_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_apcm_conn_add_cnf_t *data);
+ cp_msg_apcm_conn_add_cnf_t *data);
void
cp_msg_apcm_conn_add_ind_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_apcm_conn_add_ind_t *data);
+ cp_msg_apcm_conn_add_ind_t *data);
bool
cp_msg_apcm_conn_add_rsp_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_add_rsp_t *data);
+ cp_msg_apcm_conn_add_rsp_t *data);
/*************************/
/*** APCM CONN REL ***/
/*************************/
@@ -610,37 +610,37 @@ cp_msg_apcm_conn_add_rsp_receive(cp_t *ctx,
bool
cp_msg_apcm_conn_rel_req_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_rel_req_t *data);
+ cp_msg_apcm_conn_rel_req_t *data);
void
cp_msg_apcm_conn_rel_ind_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_apcm_conn_rel_ind_t *data);
+ cp_msg_apcm_conn_rel_ind_t *data);
void
cp_msg_apcm_conn_rel_cnf_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_apcm_conn_rel_cnf_t *data);
+ cp_msg_apcm_conn_rel_cnf_t *data);
/*************************/
/*** APCM CONN MOD ***/
/*************************/
bool
cp_msg_apcm_conn_mod_req_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_mod_req_t *data);
+ cp_msg_apcm_conn_mod_req_t *data);
void
cp_msg_apcm_conn_mod_ind_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_apcm_conn_mod_ind_t *data);
+ cp_msg_apcm_conn_mod_ind_t *data);
bool
cp_msg_apcm_conn_mod_rsp_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_mod_rsp_t *data);
+ cp_msg_apcm_conn_mod_rsp_t *data);
void
cp_msg_apcm_conn_mod_cnf_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_apcm_conn_mod_cnf_t *data);
+ cp_msg_apcm_conn_mod_cnf_t *data);
#endif /* cp_conn_mgr_h */
diff --git a/cesar/cp2/conn/src/conn_mgr.c b/cesar/cp2/conn/src/conn_mgr.c
index beac2d027f..328a9b99b8 100644
--- a/cesar/cp2/conn/src/conn_mgr.c
+++ b/cesar/cp2/conn/src/conn_mgr.c
@@ -74,8 +74,8 @@ cp_conn_mgr_process_cm_conn_new_req(cp_t *ctx, cp_mme_rx_t *mme)
cp_sta_t *sta;
cp_net_t *net;
- cp_conn_mgr_mme_cm_conn_new_req_t received_data;
- cp_conn_mgr_mme_apcm_conn_add_ind_t send_data;
+ cp_msg_cm_conn_new_req_t received_data;
+ cp_msg_apcm_conn_add_ind_t send_data;
cp_msg_cm_conn_new_req_receive(ctx, mme, &received_data);
@@ -127,8 +127,8 @@ cp_conn_mgr_process_cm_conn_new_cnf(cp_t *ctx, cp_mme_rx_t *mme)
{
cp_conn_t *conn;
- cp_conn_mgr_mme_cm_conn_new_cnf_t received_data;
- cp_conn_mgr_mme_apcm_conn_add_cnf_t send_data;
+ cp_msg_cm_conn_new_cnf_t received_data;
+ cp_msg_apcm_conn_add_cnf_t send_data;
cp_msg_cm_conn_new_cnf_receive(ctx,
mme,
@@ -168,9 +168,9 @@ cp_conn_mgr_process_cm_conn_rel_ind(cp_t *ctx, cp_mme_rx_t *mme)
{
cp_conn_t *conn;
- cp_conn_mgr_mme_cm_conn_rel_ind_t received_data;
- cp_conn_mgr_mme_apcm_conn_rel_ind_t send_ind_data;
- cp_conn_mgr_mme_cm_conn_rel_rsp_t send_rsp_data;
+ cp_msg_cm_conn_rel_ind_t received_data;
+ cp_msg_apcm_conn_rel_ind_t send_ind_data;
+ cp_msg_cm_conn_rel_rsp_t send_rsp_data;
conn = cp_conn_get_conn(ctx, received_data.cid);
cp_msg_cm_conn_rel_ind_receive(ctx, mme, &received_data);
@@ -211,7 +211,7 @@ cp_conn_mgr_process_cm_conn_rel_ind(cp_t *ctx, cp_mme_rx_t *mme)
void
cp_conn_mgr_process_cm_conn_rel_rsp(cp_t *ctx, cp_mme_rx_t *mme)
{
- cp_conn_mgr_mme_cm_conn_rel_rsp_t received_data;
+ cp_msg_cm_conn_rel_rsp_t received_data;
cp_msg_cm_conn_rel_rsp_receive(ctx, mme, &received_data);
@@ -233,8 +233,8 @@ cp_conn_mgr_process_cm_conn_mod_req(cp_t *ctx, cp_mme_rx_t *mme)
{
cp_conn_t *conn;
- cp_conn_mgr_mme_cm_conn_mod_req_t received_data;
- cp_conn_mgr_mme_apcm_conn_mod_ind_t send_data;
+ cp_msg_cm_conn_mod_req_t received_data;
+ cp_msg_apcm_conn_mod_ind_t send_data;
cp_msg_cm_conn_mod_req_receive(ctx, mme, &received_data);
@@ -263,8 +263,8 @@ cp_conn_mgr_process_cm_conn_mod_req(cp_t *ctx, cp_mme_rx_t *mme)
void
cp_conn_mgr_process_cm_conn_mod_cnf(cp_t *ctx, cp_mme_rx_t *mme)
{
- cp_conn_mgr_mme_cm_conn_mod_cnf_t received_data;
- //cp_conn_mgr_mme_apcm_conn_mod_cnf_t send_data;
+ cp_msg_cm_conn_mod_cnf_t received_data;
+ //cp_msg_apcm_conn_mod_cnf_t send_data;
cp_msg_cm_conn_mod_cnf_receive(ctx, mme, &received_data);
@@ -281,7 +281,7 @@ cp_conn_mgr_process_cm_conn_mod_cnf(cp_t *ctx, cp_mme_rx_t *mme)
void
cp_conn_mgr_process_cm_conn_info_req(cp_t *ctx, cp_mme_rx_t *mme)
{
- cp_conn_mgr_mme_cm_conn_info_req_t received_data;
+ cp_msg_cm_conn_info_req_t received_data;
cp_msg_cm_conn_info_req_receive(ctx, mme, &received_data);
@@ -297,7 +297,7 @@ cp_conn_mgr_process_cm_conn_info_req(cp_t *ctx, cp_mme_rx_t *mme)
void
cp_conn_mgr_process_cm_conn_info_cnf(cp_t *ctx, cp_mme_rx_t *mme)
{
- cp_conn_mgr_mme_cm_conn_info_cnf_t received_data;
+ cp_msg_cm_conn_info_cnf_t received_data;
cp_msg_cm_conn_info_cnf_receive(ctx, mme, &received_data);
@@ -323,8 +323,8 @@ cp_conn_mgr_process_apcm_conn_add_req(cp_t *ctx, cp_mme_rx_t *mme)
cp_conn_t *conn;
- cp_conn_mgr_mme_apcm_conn_add_req_t received_data;
- cp_conn_mgr_mme_cm_conn_new_req_t send_data;
+ cp_msg_apcm_conn_add_req_t received_data;
+ cp_msg_cm_conn_new_req_t send_data;
net = cp_sta_mgr_get_our_avln(ctx);
@@ -384,8 +384,8 @@ void
cp_conn_mgr_process_apcm_conn_add_rsp(cp_t *ctx, cp_mme_rx_t *mme)
{
cp_conn_t *conn;
- cp_conn_mgr_mme_apcm_conn_add_rsp_t received_data;
- cp_conn_mgr_mme_cm_conn_new_cnf_t send_data;
+ cp_msg_apcm_conn_add_rsp_t received_data;
+ cp_msg_cm_conn_new_cnf_t send_data;
cp_msg_apcm_conn_add_rsp_receive(ctx, mme, &received_data);
@@ -419,8 +419,8 @@ void
cp_conn_mgr_process_apcm_conn_mod_req(cp_t *ctx, cp_mme_rx_t *mme)
{
cp_conn_t *conn;
- cp_conn_mgr_mme_apcm_conn_mod_req_t received_data;
- cp_conn_mgr_mme_cm_conn_mod_req_t send_data;
+ cp_msg_apcm_conn_mod_req_t received_data;
+ cp_msg_cm_conn_mod_req_t send_data;
cp_msg_apcm_conn_mod_req_receive(ctx, mme, &received_data);
@@ -450,8 +450,8 @@ void
cp_conn_mgr_process_apcm_conn_mod_rsp(cp_t *ctx, cp_mme_rx_t *mme)
{
cp_conn_t *conn;
- cp_conn_mgr_mme_apcm_conn_mod_rsp_t received_data;
- cp_conn_mgr_mme_cm_conn_mod_cnf_t send_data;
+ cp_msg_apcm_conn_mod_rsp_t received_data;
+ cp_msg_cm_conn_mod_cnf_t send_data;
cp_msg_apcm_conn_mod_rsp_receive(ctx, mme, &received_data);
@@ -479,8 +479,8 @@ void
cp_conn_mgr_process_apcm_conn_rel_req(cp_t *ctx, cp_mme_rx_t *mme)
{
cp_conn_t *conn;
- cp_conn_mgr_mme_apcm_conn_rel_req_t received_data;
- cp_conn_mgr_mme_cm_conn_rel_ind_t send_data;
+ cp_msg_apcm_conn_rel_req_t received_data;
+ cp_msg_cm_conn_rel_ind_t send_data;
cp_msg_apcm_conn_rel_req_receive(ctx, mme, &received_data);
diff --git a/cesar/cp2/conn/test/src/msg_stub.c b/cesar/cp2/conn/test/src/msg_stub.c
index 9a533182aa..67a8446abb 100644
--- a/cesar/cp2/conn/test/src/msg_stub.c
+++ b/cesar/cp2/conn/test/src/msg_stub.c
@@ -30,7 +30,7 @@
void
cp_msg_cm_conn_new_req_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_new_req_t *data)
+ cp_msg_cm_conn_new_req_t *data)
{
}
@@ -45,7 +45,7 @@ cp_msg_cm_conn_new_req_send(cp_t *ctx,
bool
cp_msg_cm_conn_new_req_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_new_req_t *data)
+ cp_msg_cm_conn_new_req_t *data)
{
return true;
}
@@ -53,14 +53,14 @@ cp_msg_cm_conn_new_req_receive(cp_t *ctx,
void
cp_msg_cm_conn_new_cnf_sent(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_new_cnf_t *data)
+ cp_msg_cm_conn_new_cnf_t *data)
{
}
bool
cp_msg_cm_conn_new_cnf_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_new_cnf_t *data)
+ cp_msg_cm_conn_new_cnf_t *data)
{
return true;
}
@@ -71,14 +71,14 @@ cp_msg_cm_conn_new_cnf_receive(cp_t *ctx,
void
cp_msg_apcm_conn_add_req_send(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_add_req_t *data)
+ cp_msg_apcm_conn_add_req_t *data)
{
}
bool
cp_msg_apcm_conn_add_req_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_add_req_t *data)
+ cp_msg_apcm_conn_add_req_t *data)
{
return true;
}
@@ -93,7 +93,7 @@ cp_msg_apcm_conn_add_req_receive(cp_t *ctx,
void
cp_msg_apcm_conn_add_cnf_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_apcm_conn_add_cnf_t *data)
+ cp_msg_apcm_conn_add_cnf_t *data)
{
}
@@ -108,7 +108,7 @@ cp_msg_apcm_conn_add_cnf_send(cp_t *ctx,
bool
cp_msg_apcm_conn_add_cnf_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_add_cnf_t *data)
+ cp_msg_apcm_conn_add_cnf_t *data)
{
return true;
}
@@ -122,7 +122,7 @@ cp_msg_apcm_conn_add_cnf_receive(cp_t *ctx,
void
cp_msg_apcm_conn_add_ind_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_apcm_conn_add_ind_t *data)
+ cp_msg_apcm_conn_add_ind_t *data)
{
}
@@ -137,7 +137,7 @@ cp_msg_apcm_conn_add_ind_send(cp_t *ctx,
bool
cp_msg_apcm_conn_add_ind_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_add_ind_t *data)
+ cp_msg_apcm_conn_add_ind_t *data)
{
return true;
}
@@ -151,7 +151,7 @@ cp_msg_apcm_conn_add_ind_receive(cp_t *ctx,
void
cp_msg_apcm_conn_rel_ind_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_apcm_conn_rel_ind_t *data)
+ cp_msg_apcm_conn_rel_ind_t *data)
{
}
/**
@@ -165,7 +165,7 @@ cp_msg_apcm_conn_rel_ind_send(cp_t *ctx,
bool
cp_msg_cm_conn_rel_ind_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_rel_ind_t *data)
+ cp_msg_cm_conn_rel_ind_t *data)
{
return true;
}
@@ -180,7 +180,7 @@ cp_msg_cm_conn_rel_ind_receive(cp_t *ctx,
void
cp_msg_cm_conn_rel_rsp_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_rel_rsp_t *data)
+ cp_msg_cm_conn_rel_rsp_t *data)
{
}
@@ -195,7 +195,7 @@ cp_msg_cm_conn_rel_rsp_send(cp_t *ctx,
bool
cp_msg_cm_conn_rel_rsp_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_rel_rsp_t *data)
+ cp_msg_cm_conn_rel_rsp_t *data)
{
return true;
}
@@ -203,14 +203,14 @@ cp_msg_cm_conn_rel_rsp_receive(cp_t *ctx,
void
cp_msg_cm_conn_info_req_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_info_req_t *data)
+ cp_msg_cm_conn_info_req_t *data)
{
}
bool
cp_msg_cm_conn_info_req_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_info_req_t *data)
+ cp_msg_cm_conn_info_req_t *data)
{
return true;
}
@@ -218,20 +218,20 @@ cp_msg_cm_conn_info_req_receive(cp_t *ctx,
bool
cp_msg_cm_conn_mod_req_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_mod_req_t *data)
+ cp_msg_cm_conn_mod_req_t *data)
{
return true;
}
void
cp_msg_apcm_conn_mod_ind_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_apcm_conn_mod_ind_t *data)
+ cp_msg_apcm_conn_mod_ind_t *data)
{
}
bool
cp_msg_cm_conn_mod_cnf_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_mod_cnf_t *data)
+ cp_msg_cm_conn_mod_cnf_t *data)
{
return true;
}
@@ -239,28 +239,28 @@ cp_msg_cm_conn_mod_cnf_receive(cp_t *ctx,
bool
cp_msg_cm_conn_info_cnf_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_cm_conn_info_cnf_t *data)
+ cp_msg_cm_conn_info_cnf_t *data)
{
return true;
}
bool
cp_msg_apcm_conn_add_rsp_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_add_rsp_t *data)
+ cp_msg_apcm_conn_add_rsp_t *data)
{
return true;
}
void
cp_msg_cm_conn_new_cnf_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_new_cnf_t *data)
+ cp_msg_cm_conn_new_cnf_t *data)
{
}
bool
cp_msg_apcm_conn_mod_req_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_mod_req_t *data)
+ cp_msg_apcm_conn_mod_req_t *data)
{
return true;
}
@@ -268,14 +268,14 @@ cp_msg_apcm_conn_mod_req_receive(cp_t *ctx,
void
cp_msg_cm_conn_mod_req_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_mod_req_t *data)
+ cp_msg_cm_conn_mod_req_t *data)
{
}
bool
cp_msg_apcm_conn_mod_rsp_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_mod_rsp_t *data)
+ cp_msg_apcm_conn_mod_rsp_t *data)
{
return true;
}
@@ -283,21 +283,21 @@ cp_msg_apcm_conn_mod_rsp_receive(cp_t *ctx,
void
cp_msg_cm_conn_mod_cnf_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_mod_cnf_t *data)
+ cp_msg_cm_conn_mod_cnf_t *data)
{
}
bool
cp_msg_apcm_conn_rel_req_receive(cp_t *ctx,
cp_mme_rx_t *mme,
- cp_conn_mgr_mme_apcm_conn_rel_req_t *data)
+ cp_msg_apcm_conn_rel_req_t *data)
{
return true;
}
void
cp_msg_cm_conn_rel_ind_send(cp_t *ctx,
cp_mme_peer_t peer,
- cp_conn_mgr_mme_cm_conn_rel_ind_t *data)
+ cp_msg_cm_conn_rel_ind_t *data)
{
}