diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2016-07-06 15:58:48 +0200 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2016-07-12 00:51:21 +0200 |
commit | 0a43722a488aa650ce0192a409734b9ddc093603 (patch) | |
tree | 5afe500a650432e7ee0d09201c01b0cdbdc6fa72 | |
parent | 6458c30db459c666bce4a517c46b8dfdc1889f53 (diff) |
fix compiler warnings with new libosmo-sccp: rename to osmo_sccp_*
See libosmo-sccp.git 1a3875092f93df3c3054d26eac52bb0ea9bd09c3
Note: at time of commit, osmo-iuh still depends on the libosmo-sccp sysmocom/iu
branch to build.
The same rename has been committed to both sysmocom/iu and master on
libosmo-sccp. Above commit hash is on sysmocom/iu. The master commit is
03ad002c28073b347b92bcde16d5af80a06389e4.
Change-Id: Id9c0065d7398a6205ff24477d47c9663caac669c
-rw-r--r-- | src/hnbgw.c | 4 | ||||
-rw-r--r-- | src/hnbgw.h | 4 | ||||
-rw-r--r-- | src/hnbgw_cn.c | 2 | ||||
-rw-r--r-- | src/tests/dummy_cn_sua.c | 12 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/hnbgw.c b/src/hnbgw.c index 103e29e..8608903 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -382,8 +382,8 @@ static void hnbgw_vty_init(void) int main(int argc, char **argv) { - struct osmo_sua_user *sua_user; - struct osmo_sua_link *sua_link; + struct osmo_sccp_user *sua_user; + struct osmo_sccp_link *sua_link; struct osmo_stream_srv_link *srv; int rc; diff --git a/src/hnbgw.h b/src/hnbgw.h index a7a6f9a..9f010d9 100644 --- a/src/hnbgw.h +++ b/src/hnbgw.h @@ -64,8 +64,8 @@ struct hnbgw_cnlink { /* timer for re-transmitting the RANAP Reset */ struct osmo_timer_list T_RafC; /* reference to the SCCP User SAP by which we communicate */ - struct osmo_sua_user *sua_user; - struct osmo_sua_link *sua_link; + struct osmo_sccp_user *sua_user; + struct osmo_sccp_link *sua_link; struct osmo_sccp_addr local_addr; struct osmo_sccp_addr remote_addr; uint32_t next_conn_id; diff --git a/src/hnbgw_cn.c b/src/hnbgw_cn.c index eb4b21a..61db35d 100644 --- a/src/hnbgw_cn.c +++ b/src/hnbgw_cn.c @@ -327,7 +327,7 @@ static int handle_cn_disc_ind(struct hnbgw_cnlink *cnlink, } /* Entry point for primitives coming up from SCCP User SAP */ -static int sccp_sap_up(struct osmo_prim_hdr *oph, struct osmo_sua_link *slink) +static int sccp_sap_up(struct osmo_prim_hdr *oph, struct osmo_sccp_link *slink) { struct hnbgw_cnlink *cnlink = osmo_sua_link_get_user_priv(slink); struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; diff --git a/src/tests/dummy_cn_sua.c b/src/tests/dummy_cn_sua.c index 2aee171..c2fc712 100644 --- a/src/tests/dummy_cn_sua.c +++ b/src/tests/dummy_cn_sua.c @@ -31,13 +31,13 @@ const char *cmdline_bind_addr = "127.0.0.1"; struct ue_conn_ctx { struct llist_head list; - struct osmo_sua_link *link; + struct osmo_sccp_link *link; uint32_t conn_id; }; static LLIST_HEAD(conn_ctx_list); -struct ue_conn_ctx *ue_conn_ctx_alloc(struct osmo_sua_link *link, uint32_t conn_id) +struct ue_conn_ctx *ue_conn_ctx_alloc(struct osmo_sccp_link *link, uint32_t conn_id) { struct ue_conn_ctx *ctx = talloc_zero(NULL, struct ue_conn_ctx); @@ -48,7 +48,7 @@ struct ue_conn_ctx *ue_conn_ctx_alloc(struct osmo_sua_link *link, uint32_t conn_ return ctx; } -struct ue_conn_ctx *ue_conn_ctx_find(struct osmo_sua_link *link, uint32_t conn_id) +struct ue_conn_ctx *ue_conn_ctx_find(struct osmo_sccp_link *link, uint32_t conn_id) { struct ue_conn_ctx *ctx; @@ -240,8 +240,8 @@ static void cn_ranap_handle_cl(void *ctx, ranap_message *message) * ***********************************************************************/ -int tx_unitdata(struct osmo_sua_link *link); -int tx_conn_req(struct osmo_sua_link *link, uint32_t conn_id); +int tx_unitdata(struct osmo_sccp_link *link); +int tx_conn_req(struct osmo_sccp_link *link, uint32_t conn_id); struct osmo_prim_hdr *make_conn_req(uint32_t conn_id); struct osmo_prim_hdr *make_dt1_req(uint32_t conn_id, const uint8_t *data, unsigned int len); @@ -359,7 +359,7 @@ static void handle_options(int argc, char **argv) int main(int argc, char **argv) { - struct osmo_sua_user *user; + struct osmo_sccp_user *user; void *ctx = talloc_named_const(NULL, 1, "root"); int rc; int port = 14001; |