From: ljsebald <ljs...@us...> - 2023-06-24 03:15:07
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "A pseudo Operating System for the Dreamcast.". The branch, master has been updated via fa92fd20540f5560a976633bc394a286f272d9fd (commit) via f138513d61d7d4631ec8b2f456b8406d4d9231e4 (commit) via 3fc8c74a998438b514fad2a5afed9084f20ae04f (commit) via 4fbc6040cca45dbd395cfe6a1486b6e20facbe98 (commit) from a1458e8916dcdeebd61462004a744dc0cb11832c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fa92fd20540f5560a976633bc394a286f272d9fd Merge: f138513 4fbc604 Author: Lawrence Sebald <ljs...@us...> Date: Fri Jun 23 23:13:45 2023 -0400 Merge pull request #250 from KallistiOS/maxfnlen Define MAX_FN_LEN to NAME_MAX for legacy code compatibility commit f138513d61d7d4631ec8b2f456b8406d4d9231e4 Merge: a1458e8 3fc8c74 Author: Lawrence Sebald <ljs...@us...> Date: Fri Jun 23 23:10:56 2023 -0400 Merge pull request #251 from KallistiOS/arpfix Only send ARP reply packets if we are intended receiver commit 3fc8c74a998438b514fad2a5afed9084f20ae04f Author: darc <da...@pr...> Date: Fri Jun 23 21:44:45 2023 -0500 Only send ARP reply packets if we are intended receiver commit 4fbc6040cca45dbd395cfe6a1486b6e20facbe98 Author: darc <da...@pr...> Date: Fri Jun 23 00:03:10 2023 -0500 Define MAX_FN_LEN to NAME_MAX for legacy code compatibility ----------------------------------------------------------------------- Summary of changes: include/kos/limits.h | 5 +++++ kernel/net/net_arp.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/kos/limits.h b/include/kos/limits.h index b8466ed..212a647 100644 --- a/include/kos/limits.h +++ b/include/kos/limits.h @@ -20,6 +20,11 @@ #define NAME_MAX 256 /**< \brief Max filename length */ #endif +/* MAX_FN_LEN defined for legacy code compatibility */ +#ifndef MAX_FN_LEN +#define MAX_FN_LEN NAME_MAX +#endif + #ifndef PATH_MAX #define PATH_MAX 4096 /**< \brief Max path length */ #endif diff --git a/kernel/net/net_arp.c b/kernel/net/net_arp.c index 8926a89..0ae78ff 100644 --- a/kernel/net/net_arp.c +++ b/kernel/net/net_arp.c @@ -295,7 +295,9 @@ int net_arp_input(netif_t *nif, const uint8 *pkt_in, int len) { switch(pkt->opcode[1]) { case 1: /* ARP Request */ - net_arp_send(nif, pkt); + /* Send reply if we are the intended recipient */ + if(!memcmp(nif->ip_addr, pkt->pr_recv, 4)) + net_arp_send(nif, pkt); __fallthrough; /* Yes, this really should fall through here. */ case 2: /* ARP Reply */ hooks/post-receive -- A pseudo Operating System for the Dreamcast. |