Skip to content

Commit

Permalink
socket: Change return types of link_socket_write* to ssize_t
Browse files Browse the repository at this point in the history
This is the actual return value of send/sendto/sendmsg.
We will leave it to the single caller of link_socket_write()
to decide how to map that to the int buffer world. For now
just cast it explicitly.

Change-Id: I7852c06d331326c1dbab7b642254c0c00d4cebb8
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20240918204844.2820-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29323.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
  • Loading branch information
flichtenheld authored and cron2 committed Sep 18, 2024
1 parent b59620f commit 2cc77de
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/openvpn/forward.c
Original file line number Diff line number Diff line change
Expand Up @@ -1792,7 +1792,7 @@ process_outgoing_link(struct context *c)
socks_preprocess_outgoing_link(c, &to_addr, &size_delta);

/* Send packet */
size = link_socket_write(c->c2.link_socket, &c->c2.to_link, to_addr);
size = (int)link_socket_write(c->c2.link_socket, &c->c2.to_link, to_addr);

/* Undo effect of prepend */
link_socket_write_post_size_adjust(&size, size_delta, &c->c2.to_link);
Expand Down
4 changes: 2 additions & 2 deletions src/openvpn/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -3399,7 +3399,7 @@ link_socket_read_udp_posix(struct link_socket *sock,
* Socket Write Routines
*/

int
ssize_t
link_socket_write_tcp(struct link_socket *sock,
struct buffer *buf,
struct link_socket_actual *to)
Expand All @@ -3418,7 +3418,7 @@ link_socket_write_tcp(struct link_socket *sock,

#if ENABLE_IP_PKTINFO

size_t
ssize_t
link_socket_write_udp_posix_sendmsg(struct link_socket *sock,
struct buffer *buf,
struct link_socket_actual *to)
Expand Down
20 changes: 10 additions & 10 deletions src/openvpn/socket.h
Original file line number Diff line number Diff line change
Expand Up @@ -1099,9 +1099,9 @@ link_socket_read(struct link_socket *sock,
* Socket Write routines
*/

int link_socket_write_tcp(struct link_socket *sock,
struct buffer *buf,
struct link_socket_actual *to);
ssize_t link_socket_write_tcp(struct link_socket *sock,
struct buffer *buf,
struct link_socket_actual *to);

#ifdef _WIN32

Expand Down Expand Up @@ -1135,12 +1135,12 @@ link_socket_write_win32(struct link_socket *sock,

#else /* ifdef _WIN32 */

size_t link_socket_write_udp_posix_sendmsg(struct link_socket *sock,
struct buffer *buf,
struct link_socket_actual *to);
ssize_t link_socket_write_udp_posix_sendmsg(struct link_socket *sock,
struct buffer *buf,
struct link_socket_actual *to);


static inline size_t
static inline ssize_t
link_socket_write_udp_posix(struct link_socket *sock,
struct buffer *buf,
struct link_socket_actual *to)
Expand All @@ -1158,7 +1158,7 @@ link_socket_write_udp_posix(struct link_socket *sock,
(socklen_t) af_addr_size(to->dest.addr.sa.sa_family));
}

static inline size_t
static inline ssize_t
link_socket_write_tcp_posix(struct link_socket *sock,
struct buffer *buf,
struct link_socket_actual *to)
Expand All @@ -1168,7 +1168,7 @@ link_socket_write_tcp_posix(struct link_socket *sock,

#endif /* ifdef _WIN32 */

static inline size_t
static inline ssize_t
link_socket_write_udp(struct link_socket *sock,
struct buffer *buf,
struct link_socket_actual *to)
Expand All @@ -1181,7 +1181,7 @@ link_socket_write_udp(struct link_socket *sock,
}

/* write a TCP or UDP packet to link */
static inline int
static inline ssize_t
link_socket_write(struct link_socket *sock,
struct buffer *buf,
struct link_socket_actual *to)
Expand Down

0 comments on commit 2cc77de

Please sign in to comment.