*/
#include <slirp.h>
-#include <osdep.h>
+#include <qemu/osdep.h>
#include "ip_icmp.h"
static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp);
slirp->ipq.ip_link.next = slirp->ipq.ip_link.prev = &slirp->ipq.ip_link;
udp_init(slirp);
tcp_init(slirp);
+ icmp_init(slirp);
+}
+
+void ip_cleanup(Slirp *slirp)
+{
+ udp_cleanup(slirp);
+ tcp_cleanup(slirp);
+ icmp_cleanup(slirp);
}
/*
goto bad;
}
- if (slirp->restricted) {
- if ((ip->ip_dst.s_addr & slirp->vnetwork_mask.s_addr) ==
- slirp->vnetwork_addr.s_addr) {
- if (ip->ip_dst.s_addr == 0xffffffff && ip->ip_p != IPPROTO_UDP)
- goto bad;
- } else {
- uint32_t inv_mask = ~slirp->vnetwork_mask.s_addr;
- struct ex_list *ex_ptr;
-
- if ((ip->ip_dst.s_addr & inv_mask) == inv_mask) {
- goto bad;
- }
- for (ex_ptr = slirp->exec_list; ex_ptr; ex_ptr = ex_ptr->ex_next)
- if (ex_ptr->ex_addr.s_addr == ip->ip_dst.s_addr)
- break;
-
- if (!ex_ptr)
- goto bad;
- }
- }
-
/* Should drop packet if mbuf too long? hmmm... */
if (m->m_len > ip->ip_len)
m_adj(m, ip->ip_len - m->m_len);
/* check ip_ttl for a correct ICMP reply */
- if(ip->ip_ttl==0 || ip->ip_ttl==1) {
+ if(ip->ip_ttl==0) {
icmp_error(m, ICMP_TIMXCEED,ICMP_TIMXCEED_INTRANS, 0,"ttl");
goto bad;
}
}
return;
bad:
- m_freem(m);
- return;
+ m_free(m);
}
#define iptofrag(P) ((struct ipasfrag *)(((char*)(P)) - sizeof(struct qlink)))
break;
}
q = q->ipf_next;
- m_freem(dtom(slirp, q->ipf_prev));
+ m_free(dtom(slirp, q->ipf_prev));
ip_deq(q->ipf_prev);
}
return ip;
dropfrag:
- m_freem(m);
+ m_free(m);
return NULL;
}
for (q = fp->frag_link.next; q != (struct ipasfrag*)&fp->frag_link; q = p) {
p = q->ipf_next;
ip_deq(q);
- m_freem(dtom(slirp, q));
+ m_free(dtom(slirp, q));
}
remque(&fp->ip_link);
(void) m_free(dtom(slirp, fp));
*/
break;
}
- off--; / * 0 origin * /
+ off--; /* 0 origin */
if (off > optlen - sizeof(struct in_addr)) {
/*
* End of source route. Should be for us.
/*
* If no space remains, ignore.
*/
- off--; * 0 origin *
+ off--; /* 0 origin */
if (off > optlen - sizeof(struct in_addr))
break;
bcopy((caddr_t)(&ip->ip_dst), (caddr_t)&ipaddr.sin_addr,