diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2022-12-20 15:12:48 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2022-12-20 15:12:48 +0100 |
| commit | c02ee5e8d9e853f7e4faab76eb57831d694cf7cf (patch) | |
| tree | d37f51de4de69779f092696b1a711b445bd310ef | |
| parent | 87924323518ee4a6e4d6f9cb7e06ea807176e2f5 (diff) | |
stream: osmo_stream_*_write: Unifiy way to get data and length
Change-Id: I5b5d6f7a5a1722bd01c13d32557c21d8a0889966
| -rw-r--r-- | src/stream.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/stream.c b/src/stream.c index b784b21..e9860c3 100644 --- a/src/stream.c +++ b/src/stream.c @@ -355,7 +355,7 @@ static int osmo_stream_cli_write(struct osmo_stream_cli *cli) switch (cli->sk_domain) { case AF_UNIX: - ret = send(cli->ofd.fd, msg->data, msg->len, 0); + ret = send(cli->ofd.fd, msgb_data(msg), msgb_length(msg), 0); break; case AF_UNSPEC: case AF_INET: @@ -366,13 +366,13 @@ static int osmo_stream_cli_write(struct osmo_stream_cli *cli) memset(&sinfo, 0, sizeof(sinfo)); sinfo.sinfo_ppid = htonl(msgb_sctp_ppid(msg)); sinfo.sinfo_stream = msgb_sctp_stream(msg); - ret = sctp_send(cli->ofd.fd, msg->data, msgb_length(msg), + ret = sctp_send(cli->ofd.fd, msgb_data(msg), msgb_length(msg), &sinfo, MSG_NOSIGNAL); break; #endif case IPPROTO_TCP: default: - ret = send(cli->ofd.fd, msg->data, msgb_length(msg), 0); + ret = send(cli->ofd.fd, msgb_data(msg), msgb_length(msg), 0); break; } break; @@ -1317,7 +1317,7 @@ static void osmo_stream_srv_write(struct osmo_stream_srv *conn) switch (conn->srv->sk_domain) { case AF_UNIX: - ret = send(conn->ofd.fd, msg->data, msg->len, 0); + ret = send(conn->ofd.fd, msgb_data(msg), msgb_length(msg), 0); break; case AF_INET: case AF_INET6: @@ -1328,13 +1328,13 @@ static void osmo_stream_srv_write(struct osmo_stream_srv *conn) memset(&sinfo, 0, sizeof(sinfo)); sinfo.sinfo_ppid = htonl(msgb_sctp_ppid(msg)); sinfo.sinfo_stream = msgb_sctp_stream(msg); - ret = sctp_send(conn->ofd.fd, msg->data, msgb_length(msg), + ret = sctp_send(conn->ofd.fd, msgb_data(msg), msgb_length(msg), &sinfo, MSG_NOSIGNAL); break; #endif case IPPROTO_TCP: default: - ret = send(conn->ofd.fd, msg->data, msg->len, 0); + ret = send(conn->ofd.fd, msgb_data(msg), msgb_length(msg), 0); break; } break; |