From: Amos Kong <akong@redhat.com> To: aliguori@us.ibm.com, kvm@vger.kernel.org, quintela@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org, owasserm@redhat.com, laine@redhat.com Subject: [PATCH v3 2/9] net: use tcp_server_start() for tcp server creation Date: Wed, 07 Mar 2012 06:47:54 +0800 [thread overview] Message-ID: <20120306224754.24264.40437.stgit@dhcp-8-167.nay.redhat.com> (raw) In-Reply-To: <20120306224330.24264.9494.stgit@dhcp-8-167.nay.redhat.com> Use tcp_server_start in those two functions: tcp_start_incoming_migration() net_socket_listen_init() Signed-off-by: Amos Kong <akong@redhat.com> --- 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);
WARNING: multiple messages have this Message-ID (diff)
From: Amos Kong <akong@redhat.com> To: aliguori@us.ibm.com, kvm@vger.kernel.org, quintela@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org, owasserm@redhat.com, laine@redhat.com Subject: [Qemu-devel] [PATCH v3 2/9] net: use tcp_server_start() for tcp server creation Date: Wed, 07 Mar 2012 06:47:54 +0800 [thread overview] Message-ID: <20120306224754.24264.40437.stgit@dhcp-8-167.nay.redhat.com> (raw) In-Reply-To: <20120306224330.24264.9494.stgit@dhcp-8-167.nay.redhat.com> Use tcp_server_start in those two functions: tcp_start_incoming_migration() net_socket_listen_init() Signed-off-by: Amos Kong <akong@redhat.com> --- 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);
next prev parent reply other threads:[~2012-03-06 22:47 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-03-06 22:47 [PATCH v3 0/9] support to migrate with IPv6 address Amos Kong 2012-03-06 22:47 ` [Qemu-devel] " Amos Kong 2012-03-06 22:47 ` [PATCH v3 1/9] net: introduce tcp_server_start() Amos Kong 2012-03-06 22:47 ` [Qemu-devel] " Amos Kong 2012-03-13 16:39 ` Michael Roth 2012-03-14 8:33 ` Amos Kong 2012-03-14 14:58 ` Michael Roth 2012-03-16 10:47 ` Amos Kong 2012-03-16 10:47 ` [Qemu-devel] " Amos Kong 2012-03-14 7:14 ` Orit Wasserman 2012-03-14 7:27 ` Paolo Bonzini 2012-03-14 7:27 ` Paolo Bonzini 2012-03-14 7:51 ` Amos Kong 2012-03-14 7:51 ` Amos Kong 2012-03-14 8:28 ` Paolo Bonzini 2012-03-14 8:28 ` Paolo Bonzini 2012-03-14 10:03 ` Orit Wasserman 2012-03-14 10:03 ` Orit Wasserman 2012-03-14 11:39 ` Kevin Wolf 2012-03-14 11:39 ` Kevin Wolf 2012-03-06 22:47 ` Amos Kong [this message] 2012-03-06 22:47 ` [Qemu-devel] [PATCH v3 2/9] net: use tcp_server_start() for tcp server creation Amos Kong 2012-03-06 22:48 ` [PATCH v3 3/9] net: introduce tcp_client_start() Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-13 18:35 ` Michael Roth 2012-03-14 10:19 ` Amos Kong 2012-03-14 15:30 ` Michael Roth 2012-03-14 7:31 ` Orit Wasserman 2012-03-06 22:48 ` [PATCH v3 4/9] net: use tcp_client_start for tcp client creation Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-06 22:48 ` [PATCH v3 5/9] net: refector tcp_*_start functions Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-06 22:48 ` [PATCH v3 6/9] net: use getaddrinfo() in tcp_start_common Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-06 22:48 ` [PATCH v3 7/9] net: introduce parse_host_port_info() Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-06 22:48 ` [PATCH v3 8/9] net: split hostname and service by last colon Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-13 19:34 ` Michael Roth 2012-03-06 22:48 ` [PATCH v3 9/9] net: support to include ipv6 address by brackets Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-13 19:47 ` Michael Roth 2012-03-14 9:58 ` Amos Kong 2012-03-14 9:58 ` [Qemu-devel] " Amos Kong 2012-03-14 15:38 ` Michael Roth
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20120306224754.24264.40437.stgit@dhcp-8-167.nay.redhat.com \ --to=akong@redhat.com \ --cc=aliguori@us.ibm.com \ --cc=jasowang@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=laine@redhat.com \ --cc=owasserm@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=quintela@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.