From patchwork Thu Jun 16 10:20:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashijeet Acharya X-Patchwork-Id: 9180405 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1541160760 for ; Thu, 16 Jun 2016 10:21:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0671527BF7 for ; Thu, 16 Jun 2016 10:21:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE7F8282EE; Thu, 16 Jun 2016 10:21:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5890B27BF7 for ; Thu, 16 Jun 2016 10:21:44 +0000 (UTC) Received: from localhost ([::1]:47849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDUQh-0004vj-NA for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jun 2016 06:21:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDUQE-0004sr-8E for qemu-devel@nongnu.org; Thu, 16 Jun 2016 06:21:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDUQA-0007p5-Eg for qemu-devel@nongnu.org; Thu, 16 Jun 2016 06:21:13 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:34680) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDUQA-0007p0-4B for qemu-devel@nongnu.org; Thu, 16 Jun 2016 06:21:10 -0400 Received: by mail-pf0-x241.google.com with SMTP id 66so3794635pfy.1 for ; Thu, 16 Jun 2016 03:21:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=K1fY3LzL1yxGuHlVBicakVXr3fWCSoCO1UuOtMAfU90=; b=o0QZamrVPEQCYlCU7hHBLhYmtSo0Y0TVJwdCzW+O1vHKHdL4OANR7v+olztyuG99ye DiZu2/mUygo7J2WPvgJ9E8xMbkuZJhVniW1I3hm8s5y+i6njXJZFvsa7cgp2daNmCJUs k3lCQf6eEtBo1/JBXDz+zPkW+87eX0BleoUe1i2IwozjNnrtnWg/Rr2Ryagwc7XeusfS np7aDpDeU34USMvBci0U/6ns1BkFDLg4uk/1KhXTPewH0ZAEtGtNglSveLRJ/WBhbMmI zUAFYbIrxxZRabDtNMcRr22uwk1zgJrJgaEnLK+KkC7QUtWVF8xhOMNKGUf9P6aqtVf2 7vOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=K1fY3LzL1yxGuHlVBicakVXr3fWCSoCO1UuOtMAfU90=; b=HpHT8XneGxyPb6/3UEx5jiI3SLzAI/OCZpmuuf/2DuX2ZnQtrwOzwPf7/2EGLmo2eT /0cU7u5AeQYbQ04/PPGXlXOd0SVLKv1uHMKFEjW8BsMPaRvuKqPGZrxtzeSB3afrGiFX ZSJZt5jcsJ7w4eVllTcYkfTs4bVUHJ+2ZnUGxrjqEeBFEuALkCBBH+YHGpUWW7Ag8awe ixpWHbPu9UAZFm0q6SF6vpU35GS8NuzQK3UhbBThZ8qG9ONj2cCYYLfMSFH7YA4CjF4A vzmQIucDvd5cF2nlSX7KinKs4QAiLPw+ANKQxJnGeHefUx7D0AiH9bNnJLAhXcXSxc2k Epmw== X-Gm-Message-State: ALyK8tI6BksaWeey1gUHtltYJn6INQaqMtFYeCNotXMWbQviU0RXOmfgOFbQ6wFJXATQhw== X-Received: by 10.98.90.67 with SMTP id o64mr4261874pfb.150.1466072469015; Thu, 16 Jun 2016 03:21:09 -0700 (PDT) Received: from linux.local ([122.168.235.39]) by smtp.gmail.com with ESMTPSA id vy8sm59446350pab.22.2016.06.16.03.21.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 03:21:08 -0700 (PDT) From: Ashijeet Acharya To: berrange@redhat.com Date: Thu, 16 Jun 2016 15:50:48 +0530 Message-Id: <1466072448-16388-1-git-send-email-ashijeetacharya@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1464686839-9547-1-git-send-email-ashijeetacharya@gmail.com> References: <1464686839-9547-1-git-send-email-ashijeetacharya@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH] Change net/socket.c to use socket_*() functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stefanha@gmail.com, jasowang@redhat.com, qemu-devel@nongnu.org, kraxel@redhat.com, Ashijeet Acharya , pbonzini@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use socket_*() functions from include/qemu/sockets.h instead of listen()/bind()/ connect()/parse_host_port(). socket_*() fucntions are QAPI based and this patch performs this api conversion since everything will be using QAPI based sockets in the future. Also add a helper function socket_address_to_string() in util/qemu-sockets.c which returns the string representation of socket address. The task was listed on http://wiki.qemu.org/BiteSizedTasks page. Signed-off-by: Ashijeet Acharya --- include/qemu/sockets.h | 16 ++++++++++++++- net/socket.c | 56 +++++++++++++++++++++++++------------------------- util/qemu-sockets.c | 25 ++++++++++++++++++++++ 3 files changed, 68 insertions(+), 29 deletions(-) diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 1bd9218..3a1a887 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -110,4 +110,18 @@ SocketAddress *socket_remote_address(int fd, Error **errp); void qapi_copy_SocketAddress(SocketAddress **p_dest, SocketAddress *src); -#endif /* QEMU_SOCKET_H */ +/** + * socket_address_to_string: + * @addr: the socket address struct + * @errp: pointer to uninitialized error object + * + * Get the string representation of the socket + * address. A pointer to the char array containing + * string format will be returned, the caller is + * required to release the returned value when no + * longer required with g_free. + * + * Returns: the socket address in string format, or NULL on error + */ +char *socket_address_to_string(struct SocketAddress *addr, Error **errp); +#endif /* QEMU_SOCKET_H */ \ No newline at end of file diff --git a/net/socket.c b/net/socket.c index 333fb9e..b4d1576 100644 --- a/net/socket.c +++ b/net/socket.c @@ -489,41 +489,30 @@ static int net_socket_listen_init(NetClientState *peer, { NetClientState *nc; NetSocketState *s; - struct sockaddr_in saddr; - int fd, ret; + SocketAddress *saddr; + int ret; + Error *local_error = NULL; - if (parse_host_port(&saddr, host_str) < 0) - return -1; - - fd = qemu_socket(PF_INET, SOCK_STREAM, 0); - if (fd < 0) { - perror("socket"); + saddr = socket_parse(host_str, &local_error); + if (saddr == NULL) { + error_report_err(local_error); return -1; } - qemu_set_nonblock(fd); - socket_set_fast_reuse(fd); - - ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr)); + ret = socket_listen(saddr, &local_error); if (ret < 0) { - perror("bind"); - closesocket(fd); - return -1; - } - ret = listen(fd, 0); - if (ret < 0) { - perror("listen"); - closesocket(fd); + error_report_err(local_error); return -1; } nc = qemu_new_net_client(&net_socket_info, peer, model, name); s = DO_UPCAST(NetSocketState, nc, nc); s->fd = -1; - s->listen_fd = fd; + s->listen_fd = ret; s->nc.link_down = true; qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s); + qapi_free_SocketAddress(saddr); return 0; } @@ -534,10 +523,15 @@ static int net_socket_connect_init(NetClientState *peer, { NetSocketState *s; int fd, connected, ret; - struct sockaddr_in saddr; + char *addr_str; + SocketAddress *saddr; + Error *local_error = NULL; - if (parse_host_port(&saddr, host_str) < 0) + saddr = socket_parse(host_str, &local_error); + if (saddr == NULL) { + error_report_err(local_error); return -1; + } fd = qemu_socket(PF_INET, SOCK_STREAM, 0); if (fd < 0) { @@ -545,10 +539,9 @@ static int net_socket_connect_init(NetClientState *peer, return -1; } qemu_set_nonblock(fd); - connected = 0; for(;;) { - ret = connect(fd, (struct sockaddr *)&saddr, sizeof(saddr)); + ret = socket_connect(saddr, &local_error, NULL, NULL); if (ret < 0) { if (errno == EINTR || errno == EWOULDBLOCK) { /* continue */ @@ -557,7 +550,7 @@ static int net_socket_connect_init(NetClientState *peer, errno == EINVAL) { break; } else { - perror("connect"); + error_report_err(local_error); closesocket(fd); return -1; } @@ -569,9 +562,16 @@ static int net_socket_connect_init(NetClientState *peer, s = net_socket_fd_init(peer, model, name, fd, connected); if (!s) return -1; + + addr_str = socket_address_to_string(saddr, &local_error); + if (addr_str == NULL) + return -1; + snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "socket: connect to %s:%d", - inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); + "socket: connect to %s:%s", + addr_str, saddr->u.inet.data->port); + qapi_free_SocketAddress(saddr); + g_free(addr_str); return 0; } diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 0d6cd1f..191e0e0 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -1151,3 +1151,28 @@ void qapi_copy_SocketAddress(SocketAddress **p_dest, qmp_input_visitor_cleanup(qiv); qobject_decref(obj); } + +char *socket_address_to_string(struct SocketAddress *addr, Error **errp) +{ + char *buf; + + switch (addr->type) { + case SOCKET_ADDRESS_KIND_INET: + buf = g_strdup(addr->u.inet.data->host); + break; + + case SOCKET_ADDRESS_KIND_UNIX: + buf = g_strdup(addr->u.q_unix.data->path); + break; + + case SOCKET_ADDRESS_KIND_FD: + buf = g_strdup(addr->u.fd.data->str); + break; + + default: + error_setg(errp, "socket family %d unsupported", + addr->type); + return NULL; + } + return buf; +}