mirror of
https://github.com/mirage/qubes-mirage-firewall.git
synced 2024-07-01 08:31:18 +00:00
cleanup: remove exception cases during Ethernet decode / Nat.of_ipv4_packet - they do not raise exceptions anymore
This commit is contained in:
parent
0ced0ee901
commit
554e73a46d
|
@ -87,11 +87,6 @@ let add_vif get_ts { Dao.ClientVif.domid; device_id } ~client_ip ~router ~cleanu
|
||||||
let fragment_cache = Fragments.Cache.create (256 * 1024) in
|
let fragment_cache = Fragments.Cache.create (256 * 1024) in
|
||||||
Netback.listen backend ~header_size:Ethernet_wire.sizeof_ethernet (fun frame ->
|
Netback.listen backend ~header_size:Ethernet_wire.sizeof_ethernet (fun frame ->
|
||||||
match Ethernet_packet.Unmarshal.of_cstruct frame with
|
match Ethernet_packet.Unmarshal.of_cstruct frame with
|
||||||
| exception ex ->
|
|
||||||
Log.err (fun f -> f "Error unmarshalling ethernet frame from client: %s@.%a" (Printexc.to_string ex)
|
|
||||||
Cstruct.hexdump_pp frame
|
|
||||||
);
|
|
||||||
Lwt.return_unit
|
|
||||||
| Error err -> Log.warn (fun f -> f "Invalid Ethernet frame: %s" err); Lwt.return_unit
|
| Error err -> Log.warn (fun f -> f "Invalid Ethernet frame: %s" err); Lwt.return_unit
|
||||||
| Ok (eth, payload) ->
|
| Ok (eth, payload) ->
|
||||||
match eth.Ethernet_packet.ethertype with
|
match eth.Ethernet_packet.ethertype with
|
||||||
|
|
|
@ -38,11 +38,6 @@ let listen t get_ts router =
|
||||||
~arpv4:(Arp.input t.arp)
|
~arpv4:(Arp.input t.arp)
|
||||||
~ipv4:(fun ip ->
|
~ipv4:(fun ip ->
|
||||||
match Nat_packet.of_ipv4_packet t.fragments ~now:(get_ts ()) ip with
|
match Nat_packet.of_ipv4_packet t.fragments ~now:(get_ts ()) ip with
|
||||||
| exception ex ->
|
|
||||||
Log.err (fun f -> f "Error unmarshalling ethernet frame from uplink: %s@.%a" (Printexc.to_string ex)
|
|
||||||
Cstruct.hexdump_pp frame
|
|
||||||
);
|
|
||||||
Lwt.return_unit
|
|
||||||
| Error e ->
|
| Error e ->
|
||||||
Log.warn (fun f -> f "Ignored unknown IPv4 message from uplink: %a" Nat_packet.pp_error e);
|
Log.warn (fun f -> f "Ignored unknown IPv4 message from uplink: %a" Nat_packet.pp_error e);
|
||||||
Lwt.return_unit
|
Lwt.return_unit
|
||||||
|
|
Loading…
Reference in New Issue
Block a user