[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/9] net: use tcp_server_start() for tcp server c
From: |
Amos Kong |
Subject: |
[Qemu-devel] [PATCH v2 2/9] net: use tcp_server_start() for tcp server creation |
Date: |
Mon, 05 Mar 2012 18:03:29 +0800 |
User-agent: |
StGit/0.15 |
Use tcp_server_start in those two functions:
tcp_start_incoming_migration()
net_socket_listen_init()
Signed-off-by: Amos Kong <address@hidden>
---
migration-tcp.c | 21 +++++----------------
net/socket.c | 23 +++--------------------
2 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/migration-tcp.c b/migration-tcp.c
index 35a5781..ecadd10 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -157,28 +157,17 @@ out2:
int tcp_start_incoming_migration(const char *host_port)
{
- struct sockaddr_in addr;
- int val;
+ int ret;
int s;
DPRINTF("Attempting to start an incoming migration\n");
- if (parse_host_port(&addr, host_port) < 0) {
- fprintf(stderr, "invalid host/port combination: %s\n", host_port);
- return -EINVAL;
- }
-
- s = qemu_socket(PF_INET, SOCK_STREAM, 0);
- if (s == -1) {
- return -socket_error();
+ ret = tcp_server_start(host_port, &s);
+ if (ret < 0) {
+ fprintf(stderr, "tcp_server_start: %s\n", strerror(-ret));
+ return ret;
}
- val = 1;
- setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val));
-
- if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
- goto err;
- }
if (listen(s, 1) == -1) {
goto err;
}
diff --git a/net/socket.c b/net/socket.c
index 0bcf229..5feb3d2 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -403,31 +403,14 @@ static int net_socket_listen_init(VLANState *vlan,
const char *host_str)
{
NetSocketListenState *s;
- int fd, val, ret;
- struct sockaddr_in saddr;
-
- if (parse_host_port(&saddr, host_str) < 0)
- return -1;
+ int fd, ret;
s = g_malloc0(sizeof(NetSocketListenState));
- fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
- if (fd < 0) {
- perror("socket");
- g_free(s);
- return -1;
- }
- socket_set_nonblock(fd);
-
- /* allow fast reuse */
- val = 1;
- setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val));
-
- ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr));
+ ret = tcp_server_start(host_str, &fd);
if (ret < 0) {
- perror("bind");
+ error_report("tcp_server_start: %s", strerror(-ret));
g_free(s);
- closesocket(fd);
return -1;
}
ret = listen(fd, 0);
- [Qemu-devel] [PATCH v2 0/9] support to migrate with IPv6 address, Amos Kong, 2012/03/05
- [Qemu-devel] [PATCH v2 1/9] net: introduce tcp_server_start(), Amos Kong, 2012/03/05
- [Qemu-devel] [PATCH v2 2/9] net: use tcp_server_start() for tcp server creation,
Amos Kong <=
- [Qemu-devel] [PATCH v2 3/9] net: introduce tcp_client_start(), Amos Kong, 2012/03/05
- [Qemu-devel] [PATCH v2 4/9] net: use tcp_client_start for tcp client creation, Amos Kong, 2012/03/05
- [Qemu-devel] [PATCH v2 5/9] net: refector tcp_*_start functions, Amos Kong, 2012/03/05
- [Qemu-devel] [PATCH v2 8/9] net: split hostname and service by last colon, Amos Kong, 2012/03/05
- [Qemu-devel] [PATCH v2 9/9] net: support to include ipv6 address by brackets, Amos Kong, 2012/03/05