Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-03-03 05:29:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge from the QEMU tree:

Browse Source 
- Fix IP packet re-assembly logic (Ed Swierk)
- Suppress unaligned accesses (Fabrice Bellard)
This commit is contained in:
gbeauche 2006-05-14 17:27:38 +00:00
parent e339993b22
commit e4f5757403
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BasiliskII/src/slirp/if.c
View File

@ -52,8 +52,8 @@ if_init()
if_maxlinkhdr = 40; if_maxlinkhdr = 40;
#endif #endif
#else #else
/* 14 for ethernet + 40 */ /* 2 for alignment, 14 for ethernet, 40 for TCP/IP */
if_maxlinkhdr = 14 + 40; if_maxlinkhdr = 2 + 14 + 40;
#endif #endif
if_mtu = 1500; if_mtu = 1500;
if_mru = 1500; if_mru = 1500;

2
BasiliskII/src/slirp/ip_input.c
View File

@ -344,8 +344,8 @@ insert:
while (q != (struct ipasfrag *)fp) { while (q != (struct ipasfrag *)fp) {
struct mbuf *t; struct mbuf *t;
t = dtom(q); t = dtom(q);
m_cat(m, t);
q = (struct ipasfrag *) q->ipf_next; q = (struct ipasfrag *) q->ipf_next;
m_cat(m, t);
} }
/* /*

9
BasiliskII/src/slirp/slirp.c
View File

@ -610,11 +610,12 @@ void slirp_input(const uint8_t *pkt, int pkt_len)
m = m_get(); m = m_get();
if (!m) if (!m)
return; return;
m->m_len = pkt_len; /* Note: we add to align the IP header */
memcpy(m->m_data, pkt, pkt_len); m->m_len = pkt_len + 2;
memcpy(m->m_data + 2, pkt, pkt_len);
m->m_data += ETH_HLEN; m->m_data += 2 + ETH_HLEN;
m->m_len -= ETH_HLEN; m->m_len -= 2 + ETH_HLEN;
ip_input(m); ip_input(m);
break; break;