On 05/03/12 21:25, Orit Wasserman wrote:
On 03/05/2012 12:03 PM, Amos Kong wrote:
Introduce tcp_server_start() by moving original code in
tcp_start_incoming_migration().
Signed-off-by: Amos Kong<akong@xxxxxxxxxx>
---
net.c | 27 +++++++++++++++++++++++++++
qemu_socket.h | 2 ++
2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/net.c b/net.c
index c34474f..0260968 100644
--- a/net.c
+++ b/net.c
@@ -99,6 +99,33 @@ 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)
+{
+ int val, ret;
+ struct sockaddr_in saddr;
+
+ if (parse_host_port(&saddr, str)< 0) {
error message would be nice
+ return -1;
+ }
+
+ *fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
+ if (fd< 0) {
+ perror("socket");
+ return -1;
+ }
this is actually net_socket_listen_init version
tcp_start_incoming_migration returns the error -socket_error().
I prefer not to lose the errno.
agree.
I know that when calling net_socket_listen_init for some unknown reason there is an explict check for -1
" if (net_socket_listen_init(vlan, "socket", name, listen) == -1) {"
I think it is a good opportunity to change this check.
nod.
Orit
+ 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));
+ if (ret< 0) {
+ closesocket(*fd);
+ }
+ return ret;
+}
+
int parse_host_port(struct sockaddr_in *saddr, const char *str)
{
char buf[512];
diff --git a/qemu_socket.h b/qemu_socket.h
index fe4cf6c..d612793 100644
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -54,6 +54,8 @@ int unix_listen(const char *path, char *ostr, int olen);
int unix_connect_opts(QemuOpts *opts);
int unix_connect(const char *path);
+int tcp_server_start(const char *str, int *fd);
+
/* Old, ipv4 only bits. Don't use for new code. */
int parse_host_port(struct sockaddr_in *saddr, const char *str);
int socket_init(void);
--
Amos.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
