NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Set MAC address on TUN device for Xenner compatability

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-02-28 01:23:14 +00:00
parent 46b427a310
commit 9699e372c2
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Feb 27 20:21:35 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/bridge.c, src/bridge.h, src/qemu_conf.c: Set mac address
on TUN device to work with Xenner
Wed Feb 27 20:12:35 CET 2008 Jim Meyering <meyering@redhat.com> Wed Feb 27 20:12:35 CET 2008 Jim Meyering <meyering@redhat.com>
Make qemud/'s rpcgen rules work. Make qemud/'s rpcgen rules work.

14
src/bridge.c
View File

@ -42,6 +42,7 @@
#include <linux/sockios.h> /* SIOCBRADDBR etc. */ #include <linux/sockios.h> /* SIOCBRADDBR etc. */
#include <linux/if_bridge.h> /* SYSFS_BRIDGE_ATTR */ #include <linux/if_bridge.h> /* SYSFS_BRIDGE_ATTR */
#include <linux/if_tun.h> /* IFF_TUN, IFF_NO_PI */ #include <linux/if_tun.h> /* IFF_TUN, IFF_NO_PI */
#include <net/if_arp.h> /* ARPHRD_ETHER */
#include "internal.h" #include "internal.h"
@ -312,6 +313,7 @@ brDeleteInterface(brControl *ctl ATTRIBUTE_UNUSED,
int int
brAddTap(brControl *ctl, brAddTap(brControl *ctl,
const char *bridge, const char *bridge,
unsigned char *macaddr,
char *ifname, char *ifname,
int maxlen, int maxlen,
int *tapfd) int *tapfd)
@ -355,6 +357,18 @@ brAddTap(brControl *ctl,
} }
if (ioctl(fd, TUNSETIFF, &try) == 0) { if (ioctl(fd, TUNSETIFF, &try) == 0) {
struct ifreq addr;
memset(&addr, 0, sizeof(addr));
memcpy(addr.ifr_hwaddr.sa_data, macaddr, 6);
addr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
/* Device actually starts in 'UP' state, but it
* needs to be down to set the MAC addr
*/
if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 0)))
goto error;
if (ioctl(fd, SIOCSIFHWADDR, &addr) != 0)
goto error;
if ((errno = brAddInterface(ctl, bridge, try.ifr_name))) if ((errno = brAddInterface(ctl, bridge, try.ifr_name)))
goto error; goto error;
if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 1))) if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 1)))

1
src/bridge.h
View File

@ -62,6 +62,7 @@ int brDeleteInterface (brControl *ctl,
int brAddTap (brControl *ctl, int brAddTap (brControl *ctl,
const char *bridge, const char *bridge,
unsigned char *mac,
char *ifname, char *ifname,
int maxlen, int maxlen,
int *tapfd); int *tapfd);

1
src/qemu_conf.c
View File

@ -1530,6 +1530,7 @@ qemudNetworkIfaceConnect(virConnectPtr conn,
} }
if ((err = brAddTap(driver->brctl, brname, if ((err = brAddTap(driver->brctl, brname,
net->mac,
ifname, BR_IFNAME_MAXLEN, &tapfd))) { ifname, BR_IFNAME_MAXLEN, &tapfd))) {
qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
"Failed to add tap interface '%s' to bridge '%s' : %s", "Failed to add tap interface '%s' to bridge '%s' : %s",