net: move dump backend code from net.c to net/dump.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Mark McLoughlin
Anthony Liguori
parent
42281ac9a3
commit
1abecf77d8
1
Makefile
1
Makefile
@ -101,6 +101,7 @@ block-obj-y += $(addprefix block/, $(block-nested-y))
|
|||||||
net-obj-y = net.o
|
net-obj-y = net.o
|
||||||
net-nested-y = queue.o checksum.o
|
net-nested-y = queue.o checksum.o
|
||||||
net-nested-y += socket.o
|
net-nested-y += socket.o
|
||||||
|
net-nested-y += dump.o
|
||||||
net-nested-$(CONFIG_POSIX) += tap.o
|
net-nested-$(CONFIG_POSIX) += tap.o
|
||||||
net-nested-$(CONFIG_LINUX) += tap-linux.o
|
net-nested-$(CONFIG_LINUX) += tap-linux.o
|
||||||
net-nested-$(CONFIG_WIN32) += tap-win32.o
|
net-nested-$(CONFIG_WIN32) += tap-win32.o
|
||||||
|
|||||||
127
net.c
127
net.c
@ -90,6 +90,7 @@
|
|||||||
#include "net.h"
|
#include "net.h"
|
||||||
#include "net/tap.h"
|
#include "net/tap.h"
|
||||||
#include "net/socket.h"
|
#include "net/socket.h"
|
||||||
|
#include "net/dump.h"
|
||||||
#include "net/slirp.h"
|
#include "net/slirp.h"
|
||||||
#include "net/vde.h"
|
#include "net/vde.h"
|
||||||
#include "monitor.h"
|
#include "monitor.h"
|
||||||
@ -717,110 +718,6 @@ qemu_sendv_packet(VLANClientState *vc, const struct iovec *iov, int iovcnt)
|
|||||||
return qemu_sendv_packet_async(vc, iov, iovcnt, NULL);
|
return qemu_sendv_packet_async(vc, iov, iovcnt, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef struct DumpState {
|
|
||||||
VLANClientState *pcap_vc;
|
|
||||||
int fd;
|
|
||||||
int pcap_caplen;
|
|
||||||
} DumpState;
|
|
||||||
|
|
||||||
#define PCAP_MAGIC 0xa1b2c3d4
|
|
||||||
|
|
||||||
struct pcap_file_hdr {
|
|
||||||
uint32_t magic;
|
|
||||||
uint16_t version_major;
|
|
||||||
uint16_t version_minor;
|
|
||||||
int32_t thiszone;
|
|
||||||
uint32_t sigfigs;
|
|
||||||
uint32_t snaplen;
|
|
||||||
uint32_t linktype;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct pcap_sf_pkthdr {
|
|
||||||
struct {
|
|
||||||
int32_t tv_sec;
|
|
||||||
int32_t tv_usec;
|
|
||||||
} ts;
|
|
||||||
uint32_t caplen;
|
|
||||||
uint32_t len;
|
|
||||||
};
|
|
||||||
|
|
||||||
static ssize_t dump_receive(VLANClientState *vc, const uint8_t *buf, size_t size)
|
|
||||||
{
|
|
||||||
DumpState *s = vc->opaque;
|
|
||||||
struct pcap_sf_pkthdr hdr;
|
|
||||||
int64_t ts;
|
|
||||||
int caplen;
|
|
||||||
|
|
||||||
/* Early return in case of previous error. */
|
|
||||||
if (s->fd < 0) {
|
|
||||||
return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
ts = muldiv64(qemu_get_clock(vm_clock), 1000000, get_ticks_per_sec());
|
|
||||||
caplen = size > s->pcap_caplen ? s->pcap_caplen : size;
|
|
||||||
|
|
||||||
hdr.ts.tv_sec = ts / 1000000;
|
|
||||||
hdr.ts.tv_usec = ts % 1000000;
|
|
||||||
hdr.caplen = caplen;
|
|
||||||
hdr.len = size;
|
|
||||||
if (write(s->fd, &hdr, sizeof(hdr)) != sizeof(hdr) ||
|
|
||||||
write(s->fd, buf, caplen) != caplen) {
|
|
||||||
qemu_log("-net dump write error - stop dump\n");
|
|
||||||
close(s->fd);
|
|
||||||
s->fd = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void net_dump_cleanup(VLANClientState *vc)
|
|
||||||
{
|
|
||||||
DumpState *s = vc->opaque;
|
|
||||||
|
|
||||||
close(s->fd);
|
|
||||||
qemu_free(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int net_dump_init(VLANState *vlan, const char *device,
|
|
||||||
const char *name, const char *filename, int len)
|
|
||||||
{
|
|
||||||
struct pcap_file_hdr hdr;
|
|
||||||
DumpState *s;
|
|
||||||
|
|
||||||
s = qemu_malloc(sizeof(DumpState));
|
|
||||||
|
|
||||||
s->fd = open(filename, O_CREAT | O_WRONLY | O_BINARY, 0644);
|
|
||||||
if (s->fd < 0) {
|
|
||||||
qemu_error("-net dump: can't open %s\n", filename);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
s->pcap_caplen = len;
|
|
||||||
|
|
||||||
hdr.magic = PCAP_MAGIC;
|
|
||||||
hdr.version_major = 2;
|
|
||||||
hdr.version_minor = 4;
|
|
||||||
hdr.thiszone = 0;
|
|
||||||
hdr.sigfigs = 0;
|
|
||||||
hdr.snaplen = s->pcap_caplen;
|
|
||||||
hdr.linktype = 1;
|
|
||||||
|
|
||||||
if (write(s->fd, &hdr, sizeof(hdr)) < sizeof(hdr)) {
|
|
||||||
qemu_error("-net dump write error: %s\n", strerror(errno));
|
|
||||||
close(s->fd);
|
|
||||||
qemu_free(s);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
s->pcap_vc = qemu_new_vlan_client(NET_CLIENT_TYPE_DUMP,
|
|
||||||
vlan, NULL, device, name, NULL,
|
|
||||||
dump_receive, NULL, NULL,
|
|
||||||
net_dump_cleanup, s);
|
|
||||||
snprintf(s->pcap_vc->info_str, sizeof(s->pcap_vc->info_str),
|
|
||||||
"dump to %s (len=%d)", filename, len);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* find or alloc a new VLAN */
|
/* find or alloc a new VLAN */
|
||||||
VLANState *qemu_find_vlan(int id, int allocate)
|
VLANState *qemu_find_vlan(int id, int allocate)
|
||||||
{
|
{
|
||||||
@ -1000,28 +897,6 @@ static int net_init_nic(QemuOpts *opts,
|
|||||||
return idx;
|
return idx;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int net_init_dump(QemuOpts *opts,
|
|
||||||
Monitor *mon,
|
|
||||||
const char *name,
|
|
||||||
VLANState *vlan)
|
|
||||||
{
|
|
||||||
int len;
|
|
||||||
const char *file;
|
|
||||||
char def_file[128];
|
|
||||||
|
|
||||||
assert(vlan);
|
|
||||||
|
|
||||||
file = qemu_opt_get(opts, "file");
|
|
||||||
if (!file) {
|
|
||||||
snprintf(def_file, sizeof(def_file), "qemu-vlan%d.pcap", vlan->id);
|
|
||||||
file = def_file;
|
|
||||||
}
|
|
||||||
|
|
||||||
len = qemu_opt_get_size(opts, "len", 65536);
|
|
||||||
|
|
||||||
return net_dump_init(vlan, "dump", name, file, len);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define NET_COMMON_PARAMS_DESC \
|
#define NET_COMMON_PARAMS_DESC \
|
||||||
{ \
|
{ \
|
||||||
.name = "type", \
|
.name = "type", \
|
||||||
|
|||||||
151
net/dump.c
Normal file
151
net/dump.c
Normal file
@ -0,0 +1,151 @@
|
|||||||
|
/*
|
||||||
|
* QEMU System Emulator
|
||||||
|
*
|
||||||
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "dump.h"
|
||||||
|
#include "qemu-common.h"
|
||||||
|
#include "sysemu.h"
|
||||||
|
#include "qemu-log.h"
|
||||||
|
|
||||||
|
typedef struct DumpState {
|
||||||
|
VLANClientState *pcap_vc;
|
||||||
|
int fd;
|
||||||
|
int pcap_caplen;
|
||||||
|
} DumpState;
|
||||||
|
|
||||||
|
#define PCAP_MAGIC 0xa1b2c3d4
|
||||||
|
|
||||||
|
struct pcap_file_hdr {
|
||||||
|
uint32_t magic;
|
||||||
|
uint16_t version_major;
|
||||||
|
uint16_t version_minor;
|
||||||
|
int32_t thiszone;
|
||||||
|
uint32_t sigfigs;
|
||||||
|
uint32_t snaplen;
|
||||||
|
uint32_t linktype;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct pcap_sf_pkthdr {
|
||||||
|
struct {
|
||||||
|
int32_t tv_sec;
|
||||||
|
int32_t tv_usec;
|
||||||
|
} ts;
|
||||||
|
uint32_t caplen;
|
||||||
|
uint32_t len;
|
||||||
|
};
|
||||||
|
|
||||||
|
static ssize_t dump_receive(VLANClientState *vc, const uint8_t *buf, size_t size)
|
||||||
|
{
|
||||||
|
DumpState *s = vc->opaque;
|
||||||
|
struct pcap_sf_pkthdr hdr;
|
||||||
|
int64_t ts;
|
||||||
|
int caplen;
|
||||||
|
|
||||||
|
/* Early return in case of previous error. */
|
||||||
|
if (s->fd < 0) {
|
||||||
|
return size;
|
||||||
|
}
|
||||||
|
|
||||||
|
ts = muldiv64(qemu_get_clock(vm_clock), 1000000, get_ticks_per_sec());
|
||||||
|
caplen = size > s->pcap_caplen ? s->pcap_caplen : size;
|
||||||
|
|
||||||
|
hdr.ts.tv_sec = ts / 1000000;
|
||||||
|
hdr.ts.tv_usec = ts % 1000000;
|
||||||
|
hdr.caplen = caplen;
|
||||||
|
hdr.len = size;
|
||||||
|
if (write(s->fd, &hdr, sizeof(hdr)) != sizeof(hdr) ||
|
||||||
|
write(s->fd, buf, caplen) != caplen) {
|
||||||
|
qemu_log("-net dump write error - stop dump\n");
|
||||||
|
close(s->fd);
|
||||||
|
s->fd = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return size;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void net_dump_cleanup(VLANClientState *vc)
|
||||||
|
{
|
||||||
|
DumpState *s = vc->opaque;
|
||||||
|
|
||||||
|
close(s->fd);
|
||||||
|
qemu_free(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int net_dump_init(VLANState *vlan, const char *device,
|
||||||
|
const char *name, const char *filename, int len)
|
||||||
|
{
|
||||||
|
struct pcap_file_hdr hdr;
|
||||||
|
DumpState *s;
|
||||||
|
|
||||||
|
s = qemu_malloc(sizeof(DumpState));
|
||||||
|
|
||||||
|
s->fd = open(filename, O_CREAT | O_WRONLY | O_BINARY, 0644);
|
||||||
|
if (s->fd < 0) {
|
||||||
|
qemu_error("-net dump: can't open %s\n", filename);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
s->pcap_caplen = len;
|
||||||
|
|
||||||
|
hdr.magic = PCAP_MAGIC;
|
||||||
|
hdr.version_major = 2;
|
||||||
|
hdr.version_minor = 4;
|
||||||
|
hdr.thiszone = 0;
|
||||||
|
hdr.sigfigs = 0;
|
||||||
|
hdr.snaplen = s->pcap_caplen;
|
||||||
|
hdr.linktype = 1;
|
||||||
|
|
||||||
|
if (write(s->fd, &hdr, sizeof(hdr)) < sizeof(hdr)) {
|
||||||
|
qemu_error("-net dump write error: %s\n", strerror(errno));
|
||||||
|
close(s->fd);
|
||||||
|
qemu_free(s);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
s->pcap_vc = qemu_new_vlan_client(NET_CLIENT_TYPE_DUMP,
|
||||||
|
vlan, NULL, device, name, NULL,
|
||||||
|
dump_receive, NULL, NULL,
|
||||||
|
net_dump_cleanup, s);
|
||||||
|
snprintf(s->pcap_vc->info_str, sizeof(s->pcap_vc->info_str),
|
||||||
|
"dump to %s (len=%d)", filename, len);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int net_init_dump(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan)
|
||||||
|
{
|
||||||
|
int len;
|
||||||
|
const char *file;
|
||||||
|
char def_file[128];
|
||||||
|
|
||||||
|
assert(vlan);
|
||||||
|
|
||||||
|
file = qemu_opt_get(opts, "file");
|
||||||
|
if (!file) {
|
||||||
|
snprintf(def_file, sizeof(def_file), "qemu-vlan%d.pcap", vlan->id);
|
||||||
|
file = def_file;
|
||||||
|
}
|
||||||
|
|
||||||
|
len = qemu_opt_get_size(opts, "len", 65536);
|
||||||
|
|
||||||
|
return net_dump_init(vlan, "dump", name, file, len);
|
||||||
|
}
|
||||||
33
net/dump.h
Normal file
33
net/dump.h
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
* QEMU System Emulator
|
||||||
|
*
|
||||||
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
#ifndef QEMU_NET_DUMP_H
|
||||||
|
#define QEMU_NET_DUMP_H
|
||||||
|
|
||||||
|
#include "net.h"
|
||||||
|
#include "qemu-common.h"
|
||||||
|
|
||||||
|
int net_init_dump(QemuOpts *opts, Monitor *mon,
|
||||||
|
const char *name, VLANState *vlan);
|
||||||
|
|
||||||
|
#endif /* QEMU_NET_DUMP_H */
|
||||||
Loading…
Reference in New Issue
Block a user