Skip to content

fix: send echo reply through correct interface #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pgallino merged 4 commits into from
Jun 22, 2025
Merged

fix: send echo reply through correct interface #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f511cc
fix: send reply through correct interface
MegaRedHand Jun 22, 2025
bfd21d2
fix: make parameter not optional
MegaRedHand Jun 22, 2025
32ffd74
chore: ignore linter warning
MegaRedHand Jun 22, 2025
4040276
Merge branch 'main' into fix-echo-reply
pgallino Jun 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/types/packet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ export function sendViewPacket(
viewgraph: ViewGraph,
srcId: DeviceId,
rawPacket: EthernetFrame,
sendingIface?: number,
sendingIface: number,
) {
const srcMac = rawPacket.source;
const dstMac = rawPacket.destination;
Expand Down
14 changes: 8 additions & 6 deletions src/types/view-devices/vNetworkDevice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ export abstract class ViewNetworkDevice extends ViewDevice {
: undefined;
}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
handleDatagram(datagram: IPv4Packet, iface: number) {
console.debug("Packet has reach its destination!");
const dstDevice = this.viewgraph.getDeviceByIP(datagram.sourceAddress);
Expand All @@ -181,16 +182,17 @@ export abstract class ViewNetworkDevice extends ViewDevice {
case ICMP_PROTOCOL_NUMBER: {
const request: EchoRequest = datagram.payload as EchoRequest;
if (dstDevice && request.type === ICMP_REQUEST_TYPE_NUMBER) {
const { src, nextHop, dst } = ViewNetworkDevice.getForwardingData(
this.id,
dstDevice.id,
this.viewgraph,
);
const { src, nextHop, dst, sendingIface } =
ViewNetworkDevice.getForwardingData(
this.id,
dstDevice.id,
this.viewgraph,
);
const echoReply = new EchoReply(0);
const ipPacket = new IPv4Packet(src.ip, dst.ip, echoReply);
const frame = new EthernetFrame(src.mac, nextHop.mac, ipPacket);
console.debug(`Sending EchoReply to ${dstDevice}`);
sendViewPacket(this.viewgraph, this.id, frame, iface);
sendViewPacket(this.viewgraph, this.id, frame, sendingIface);
}
break;
}
Expand Down