@@ -99,37 +99,41 @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
return 0;
}
-int tcp_server_start(const char *str, int *fd)
+static int tcp_server_bind(int fd, struct sockaddr_in *saddr)
{
- int val, ret;
- struct sockaddr_in saddr;
+ int ret;
+ int val = 1;
- if (parse_host_port(&saddr, str) < 0) {
- return -1;
- }
+ /* allow fast reuse */
+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val));
- *fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
- if (fd < 0) {
- perror("socket");
- return -1;
+ ret = bind(fd, (struct sockaddr *)saddr, sizeof(*saddr));
+
+ if (ret == -1) {
+ ret = -socket_error();
}
- socket_set_nonblock(*fd);
+ return ret;
- /* allow fast reuse */
- val = 1;
- setsockopt(*fd, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val));
+}
+
+static int tcp_client_connect(int fd, struct sockaddr_in *saddr)
+{
+ int ret;
+
+ do {
+ ret = connect(fd, (struct sockaddr *)saddr, sizeof(*saddr));
+ if (ret == -1) {
+ ret = -socket_error();
+ }
+ } while (ret == -EINTR || ret == -EWOULDBLOCK);
- ret = bind(*fd, (struct sockaddr *)&saddr, sizeof(saddr));
- if (ret < 0) {
- closesocket(*fd);
- }
return ret;
}
-int tcp_client_start(const char *str, int *fd)
+static int tcp_start_common(const char *str, int *fd, bool server)
{
+ int ret = -EINVAL;
struct sockaddr_in saddr;
- int ret;
if (parse_host_port(&saddr, str) < 0) {
return -EINVAL;
@@ -142,29 +146,35 @@ int tcp_client_start(const char *str, int *fd)
}
socket_set_nonblock(*fd);
- for (;;) {
- ret = connect(*fd, (struct sockaddr *)&saddr, sizeof(saddr));
- if (ret < 0) {
- ret = -socket_error();
- if (ret == -EINPROGRESS) {
- break;
+ if (server) {
+ ret = tcp_server_bind(*fd, &saddr);
+ } else {
+ ret = tcp_client_connect(*fd, &saddr);
+ }
+
#ifdef _WIN32
- } else if (ret == -WSAEALREADY || ret == -WSAEINVAL) {
- break;
+ if (ret == -WSAEALREADY || ret == -WSAEINVAL) {
+ return ret; /* Success */
+ }
#endif
- } else if (ret != -EINTR && ret != -EWOULDBLOCK) {
- perror("connect");
- closesocket(*fd);
- return -1;
- }
- } else {
- break;
- }
+ if (ret >= 0 || ret == -EINPROGRESS || ret == -EWOULDBLOCK) {
+ return ret; /* Success */
}
+ closesocket(*fd);
return ret;
}
+int tcp_server_start(const char *str, int *fd)
+{
+ return tcp_start_common(str, fd, true);
+}
+
+int tcp_client_start(const char *str, int *fd)
+{
+ return tcp_start_common(str, fd, false);
+}
+
int parse_host_port(struct sockaddr_in *saddr, const char *str)
{
char buf[512];
There are some repeated code for tcp_server_start() and tcp_client_start(). Signed-off-by: Amos Kong <akong@redhat.com> --- net.c | 82 ++++++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 46 insertions(+), 36 deletions(-)