osmocom
/
libosmo-sccp
mirror of https://gerrit.osmocom.org/libosmo-sccp
11
0
Fork 0
Code Issues Releases Wiki Activity

cosmetic: rename ss7_asp_*_conn_cb to ss7_asp_*_conn_rx_cb 

The old/existing name says it is a connection call-back, but not what
kind of all-back; let's introduce 'rx' to indicate it is a receive
call-back.

Change-Id: Iaaef8128d4a26ea75fbce7067a8ab935a319beb4
This commit is contained in:
Harald Welte 2024-03-05 15:42:46 +01:00
parent 9257cd896e
commit e099fb9d69
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osmo_ss7_asp.c
View File

@ -795,7 +795,7 @@ static void log_sctp_notification(struct osmo_ss7_asp *asp, const char *pfx,
}
/* netif code tells us we can read something from the socket */
int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg)
int ss7_asp_ipa_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg)
{
int fd = osmo_stream_srv_get_fd(conn);
struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn);
@ -808,7 +808,7 @@ int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg)
}
/* netif code tells us we can read something from the socket */
int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg)
int ss7_asp_xua_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg)
{
struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn);
unsigned int ppid;
@ -868,7 +868,7 @@ int xua_tcp_segmentation_cb(struct msgb *msg)
}
/* netif code tells us we can read something from the socket */
int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg)
int ss7_asp_m3ua_tcp_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg)
{
struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn);
const struct xua_common_hdr *hdr;

8
src/osmo_ss7_xua_srv.c
View File

@ -82,21 +82,21 @@ static int xua_accept_cb(struct osmo_stream_srv_link *link, int fd)
switch (oxs->cfg.proto) {
case OSMO_SS7_ASP_PROT_IPA:
osmo_stream_srv_set_read_cb(srv, ss7_asp_ipa_srv_conn_cb);
osmo_stream_srv_set_read_cb(srv, ss7_asp_ipa_srv_conn_rx_cb);
osmo_stream_srv_set_segmentation_cb(srv, osmo_ipa_segmentation_cb);
break;
case OSMO_SS7_ASP_PROT_M3UA:
if (oxs->cfg.trans_proto == IPPROTO_SCTP)
osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_cb);
osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_rx_cb);
else if (oxs->cfg.trans_proto == IPPROTO_TCP) {
osmo_stream_srv_set_read_cb(srv, &ss7_asp_m3ua_tcp_srv_conn_cb);
osmo_stream_srv_set_read_cb(srv, &ss7_asp_m3ua_tcp_srv_conn_rx_cb);
osmo_stream_srv_set_segmentation_cb(srv, xua_tcp_segmentation_cb);
} else
OSMO_ASSERT(0);
break;
default:
OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_SCTP);
osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_cb);
osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_rx_cb);
osmo_stream_srv_set_segmentation_cb(srv, NULL);
break;
}

6
src/ss7_internal.h
View File

@ -24,9 +24,9 @@ struct osmo_ss7_asp *ss7_asp_find_by_socket_addr(int fd, int trans_proto);
bool ss7_asp_protocol_check_trans_proto(enum osmo_ss7_asp_protocol proto, int trans_proto);
int ss7_default_trans_proto_for_asp_proto(enum osmo_ss7_asp_protocol proto);
int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg);
int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg);
int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg);
int ss7_asp_ipa_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg);
int ss7_asp_xua_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg);
int ss7_asp_m3ua_tcp_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg);
int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv);
int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp);
int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp);