From 5c963ac89008fbab7ca35f87963d337b596ed8de Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Tue, 6 Nov 2018 20:12:47 +0000 Subject: [PATCH] Fix ICMP Echo reply, broken in #5522 git-svn-id: svn://kolibrios.org@7536 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/network/ethernet.inc | 3 +++ kernel/trunk/network/icmp.inc | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/trunk/network/ethernet.inc b/kernel/trunk/network/ethernet.inc index 6d9c46bc55..61ec373629 100644 --- a/kernel/trunk/network/ethernet.inc +++ b/kernel/trunk/network/ethernet.inc @@ -94,6 +94,9 @@ eth_input: popf +; Mark it as being an Ethernet Frame + mov [eax + NET_BUFF.type], NET_BUFF_ETH + ; Now queue an event to process it xor edx, edx mov eax, [ETH_input_event] diff --git a/kernel/trunk/network/icmp.inc b/kernel/trunk/network/icmp.inc index 4032284cbf..66d44396db 100644 --- a/kernel/trunk/network/icmp.inc +++ b/kernel/trunk/network/icmp.inc @@ -214,7 +214,8 @@ icmp_input: mov [esi + ICMP_header.Type], ICMP_ECHOREPLY mov eax, [esp] - lea esi, [eax + NET_BUFF.data] + mov esi, [eax + NET_BUFF.offset] + add esi, eax ; Check frame type cmp [eax + NET_BUFF.type], NET_BUFF_ETH