mirror of
https://github.com/mirage/qubes-mirage-firewall.git
synced 2025-04-11 18:29:12 -04:00
Merge pull request #213 from palainp/fallback-netvm-mac
Fallback netvm mac
This commit is contained in:
commit
f2fcae93d2
@ -571,7 +571,14 @@ struct
|
||||
I.connect ~cidr ~gateway eth arp >>= fun ip ->
|
||||
U.connect ip >>= fun udp ->
|
||||
let netvm_mac =
|
||||
Arp.query arp gateway >|= or_raise "Getting MAC of our NetVM" Arp.pp_error
|
||||
Arp.query arp gateway >>= function
|
||||
| Error e ->
|
||||
Log.err(fun f -> f "Getting MAC of our NetVM: %a" Arp.pp_error e);
|
||||
(* This mac address is a special address used by Qubes when the device
|
||||
is not managed by Qubes itself. This can occurs inside a service
|
||||
AppVM (e.g. VPN) when the service creates a new interface. *)
|
||||
Lwt.return (Macaddr.of_string_exn "fe:ff:ff:ff:ff:ff")
|
||||
| Ok mac -> Lwt.return mac
|
||||
in
|
||||
let interface =
|
||||
new netvm_iface eth netvm_mac ~my_ip ~other_ip:config.Dao.netvm_ip
|
||||
|
@ -1 +1 @@
|
||||
b78d6711b502f8babcc5c4083b0352b78be8e8a6bef044189ce7a00e6e564612 dist/qubes-firewall.xen
|
||||
0c3c2c0e62a834112c69d7cddc5dd6f70ecb93afa988768fb860ed26e423b1f8 dist/qubes-firewall.xen
|
||||
|
Loading…
x
Reference in New Issue
Block a user