From patchwork Tue Nov 29 19:55:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin X-Patchwork-Id: 128275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 93806B6F6F for ; Tue, 29 Nov 2011 21:55:42 +1100 (EST) Received: from localhost ([::1]:48156 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVLLZ-0003W9-Pi for incoming@patchwork.ozlabs.org; Tue, 29 Nov 2011 05:55:33 -0500 Received: from eggs.gnu.org ([140.186.70.92]:49703) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVLLP-0003W1-Fe for qemu-devel@nongnu.org; Tue, 29 Nov 2011 05:55:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RVLLJ-0007nj-QM for qemu-devel@nongnu.org; Tue, 29 Nov 2011 05:55:23 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:53255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVLLJ-0007nb-IC for qemu-devel@nongnu.org; Tue, 29 Nov 2011 05:55:17 -0500 Received: by iakk32 with SMTP id k32so11841702iak.4 for ; Tue, 29 Nov 2011 02:55:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=DsolXIYS7CCYXMxzVOU4kM7/hZmgRsngL7oxBGjzJeI=; b=TuZYXlBiSSZVfMScvwfN5YxUJNIQoUI/Swg1jl18HVNcSv4rb9YEmCH9KRZlBJ6LU8 2MUh4+Ue9Oe6BFdzuibmSL5jwcSVLRDKal4rk6uwDRY/XuRmIoWvnKh9xrgtm61yBeLA yiZ7sGcF3ljDA2+G2MEnT21RaKJxBUAQRhVqg= Received: by 10.50.192.197 with SMTP id hi5mr19635575igc.16.1322564115926; Tue, 29 Nov 2011 02:55:15 -0800 (PST) Received: from localhost.localdomain ([220.69.134.150]) by mx.google.com with ESMTPS id e2sm57956819ibe.0.2011.11.29.02.55.12 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 Nov 2011 02:55:15 -0800 (PST) From: Benjamin To: qemu-devel@nongnu.org Date: Wed, 30 Nov 2011 04:55:06 +0900 Message-Id: <1322596506-31056-1-git-send-email-mlspirat42@gmail.com> X-Mailer: git-send-email 1.7.6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Cc: stefanha@gmail.com, andreas.faerber@web.de, jan.kiszka@web.de, Benjamin Subject: [Qemu-devel] [PATCH v3] Support for UDP unicast network backend X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Benjamin Reviewed-by: Stefan Hajnoczi Reviewed-by: Stefan Hajnoczi --- net.c | 6 ++++- net/socket.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++- qemu-options.hx | 2 + 3 files changed, 78 insertions(+), 3 deletions(-) diff --git a/net.c b/net.c index cb52050..8e957b2 100644 --- a/net.c +++ b/net.c @@ -999,7 +999,11 @@ static const struct { }, { .name = "localaddr", .type = QEMU_OPT_STRING, - .help = "source address for multicast packets", + .help = "source address and port for multicast and udp packets", + }, { + .name = "udp", + .type = QEMU_OPT_STRING, + .help = "UDP unicast address and port number", }, { /* end of list */ } }, diff --git a/net/socket.c b/net/socket.c index e9ef128..69a03e6 100644 --- a/net/socket.c +++ b/net/socket.c @@ -524,6 +524,57 @@ static int net_socket_mcast_init(VLANState *vlan, } +static int net_socket_udp_init(VLANState *vlan, + const char *model, + const char *name, + const char *rhost, + const char *lhost) +{ + NetSocketState *s; + int fd, val, ret; + struct sockaddr_in laddr, raddr; + + if (parse_host_port(&laddr, lhost) < 0) { + return -1; + } + + if (parse_host_port(&raddr, rhost) < 0) { + return -1; + } + + fd = qemu_socket(PF_INET, SOCK_DGRAM, 0); + if (fd < 0) { + perror("socket(PF_INET, SOCK_DGRAM)"); + return -1; + } + val = 1; + ret = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, + (const char *)&val, sizeof(val)); + if (ret < 0) { + perror("setsockopt(SOL_SOCKET, SO_REUSEADDR)"); + closesocket(fd); + return -1; + } + ret = bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)); + if (ret < 0) { + perror("bind"); + closesocket(fd); + return -1; + } + + s = net_socket_fd_init(vlan, model, name, fd, 0); + if (!s) { + return -1; + } + + s->dgram_dst = raddr; + + snprintf(s->nc.info_str, sizeof(s->nc.info_str), + "socket: udp=%s:%d", + inet_ntoa(raddr.sin_addr), ntohs(raddr.sin_port)); + return 0; +} + int net_init_socket(QemuOpts *opts, Monitor *mon, const char *name, @@ -597,10 +648,28 @@ int net_init_socket(QemuOpts *opts, if (net_socket_mcast_init(vlan, "socket", name, mcast, localaddr) == -1) { return -1; } + } else if (qemu_opt_get(opts, "udp")) { + const char *udp, *localaddr; + + if (qemu_opt_get(opts, "fd") || + qemu_opt_get(opts, "connect") || + qemu_opt_get(opts, "listen") || + qemu_opt_get(opts, "mcast")) { + error_report("fd=, connect=, listen=\ + and mcast= is invalid with udp="); + return -1; + } + + udp = qemu_opt_get(opts, "udp"); + localaddr = qemu_opt_get(opts, "localaddr"); + + if (net_socket_udp_init(vlan, "udp", name, udp, localaddr) == -1) { + return -1; + } } else { - error_report("-socket requires fd=, listen=, connect= or mcast="); + error_report("-socket requires fd=, listen=, \ + connect=, mcast= or udp="); return -1; } - return 0; } diff --git a/qemu-options.hx b/qemu-options.hx index 681eaf1..5495368 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1217,6 +1217,8 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, "-net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port[,localaddr=addr]]\n" " connect the vlan 'n' to multicast maddr and port\n" " use 'localaddr=addr' to specify the host address to send packets from\n" + "-net socket[,vlan=n][,name=str][,fd=h][,udp=host:port][,localaddr=host:port]\n" + " connect the vlan 'n' to another VLAN using an UDP tunnel\n" #ifdef CONFIG_VDE "-net vde[,vlan=n][,name=str][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode]\n" " connect the vlan 'n' to port 'n' of a vde switch running\n"