Revision e7e92325

b/Makefile
90 90
net-nested-y = queue.o checksum.o
91 91
net-nested-$(CONFIG_POSIX) += tap.o
92 92
net-nested-$(CONFIG_WIN32) += tap-win32.o
93
net-nested-$(CONFIG_BSD) += tap-bsd.o
93 94
net-obj-y += $(addprefix net/, $(net-nested-y))
94 95

  
95 96
######################################################################
b/net/tap-bsd.c
1
/*
2
 * QEMU System Emulator
3
 *
4
 * Copyright (c) 2003-2008 Fabrice Bellard
5
 *
6
 * Permission is hereby granted, free of charge, to any person obtaining a copy
7
 * of this software and associated documentation files (the "Software"), to deal
8
 * in the Software without restriction, including without limitation the rights
9
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10
 * copies of the Software, and to permit persons to whom the Software is
11
 * furnished to do so, subject to the following conditions:
12
 *
13
 * The above copyright notice and this permission notice shall be included in
14
 * all copies or substantial portions of the Software.
15
 *
16
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
19
 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22
 * THE SOFTWARE.
23
 */
24

  
25
#include "net/tap.h"
26
#incude "qemu-common.h"
27

  
28
#ifdef __NetBSD__
29
#include <net/if_tap.h>
30
#endif
31

  
32
#if defined(__FreeBSD__) || defined(__DragonFly__)
33
#include <libutil.h>
34
#else
35
#include <util.h>
36
#endif
37
#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
38
#include <freebsd/stdlib.h>
39

  
40
#if defined(__OpenBSD__)
41
#include <util.h>
42
#endif
43

  
44
int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
45
{
46
    int fd;
47
    char *dev;
48
    struct stat s;
49

  
50
    TFR(fd = open("/dev/tap", O_RDWR));
51
    if (fd < 0) {
52
        fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation\n");
53
        return -1;
54
    }
55

  
56
    fstat(fd, &s);
57
    dev = devname(s.st_rdev, S_IFCHR);
58
    pstrcpy(ifname, ifname_size, dev);
59

  
60
    fcntl(fd, F_SETFL, O_NONBLOCK);
61
    return fd;
62
}
b/net/tap.c
42 42
#include "net/tap-linux.h"
43 43
#endif
44 44

  
45
#ifdef __NetBSD__
46
#include <net/if_tap.h>
47
#endif
48

  
49
#ifdef CONFIG_BSD
50
#if defined(__FreeBSD__) || defined(__DragonFly__)
51
#include <libutil.h>
52
#else
53
#include <util.h>
54
#endif
55
#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
56
#include <freebsd/stdlib.h>
57
#endif
58

  
59
#if defined(__OpenBSD__)
60
#include <util.h>
61
#endif
62

  
63 45
#ifdef __sun__
64 46
#include <sys/stat.h>
65 47
#include <sys/ethernet.h>
......
394 376
    return s;
395 377
}
396 378

  
397
#if defined (CONFIG_BSD) || defined (__FreeBSD_kernel__)
398
static int tap_open(char *ifname, int ifname_size,
399
                    int *vnet_hdr, int vnet_hdr_required)
400
{
401
    int fd;
402
    char *dev;
403
    struct stat s;
404

  
405
    TFR(fd = open("/dev/tap", O_RDWR));
406
    if (fd < 0) {
407
        fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation\n");
408
        return -1;
409
    }
410

  
411
    fstat(fd, &s);
412
    dev = devname(s.st_rdev, S_IFCHR);
413
    pstrcpy(ifname, ifname_size, dev);
414

  
415
    fcntl(fd, F_SETFL, O_NONBLOCK);
416
    return fd;
417
}
418
#elif defined(__sun__)
379
#ifdef __sun__
419 380
#define TUNNEWPPA       (('T'<<16) | 0x0001)
420 381
/*
421 382
 * Allocate TAP device, returns opened fd.
......
538 499
    return tap_fd;
539 500
}
540 501

  
541
static int tap_open(char *ifname, int ifname_size,
542
                    int *vnet_hdr, int vnet_hdr_required)
502
int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
543 503
{
544 504
    char  dev[10]="";
545 505
    int fd;
......
552 512
    return fd;
553 513
}
554 514
#elif defined (_AIX)
555
static int tap_open(char *ifname, int ifname_size,
556
                    int *vnet_hdr, int vnet_hdr_required)
515
int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
557 516
{
558 517
    fprintf (stderr, "no tap on AIX\n");
559 518
    return -1;
560 519
}
561 520
#else
562
static int tap_open(char *ifname, int ifname_size,
563
                    int *vnet_hdr, int vnet_hdr_required)
521
int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
564 522
{
565 523
    struct ifreq ifr;
566 524
    int fd, ret;
b/net/tap.h
34 34

  
35 35
int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan);
36 36

  
37
int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required);
38

  
37 39
int tap_has_ufo(VLANClientState *vc);
38 40
int tap_has_vnet_hdr(VLANClientState *vc);
39 41
void tap_using_vnet_hdr(VLANClientState *vc, int using_vnet_hdr);

Also available in: Unified diff