Merge remote-tracking branch 'stefanha/trivial-patches' into staging

[qemu.git] / slirp / ip_input.c

diff --git a/slirp/ip_input.c b/slirp/ip_input.c
index bb101da1a63daae782567f2c08947204c7504683..ce24faf165f650e7ecb5c12c0fa965a284db1808 100644 (file)
--- a/slirp/ip_input.c
+++ b/slirp/ip_input.c
@@ -58,6 +58,14 @@ ip_init(Slirp *slirp)
     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);
 }
 
 /*
@@ -118,33 +126,12 @@ ip_input(struct mbuf *m)
                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;
        }
@@ -225,7 +212,7 @@ ip_input(struct mbuf *m)
        }
        return;
 bad:
-       m_freem(m);
+       m_free(m);
        return;
 }
 
@@ -318,7 +305,7 @@ ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp)
                        break;
                }
                q = q->ipf_next;
-               m_freem(dtom(slirp, q->ipf_prev));
+               m_free(dtom(slirp, q->ipf_prev));
                ip_deq(q->ipf_prev);
        }
 
@@ -384,7 +371,7 @@ insert:
        return ip;
 
 dropfrag:
-       m_freem(m);
+       m_free(m);
         return NULL;
 }
 
@@ -400,7 +387,7 @@ ip_freef(Slirp *slirp, struct ipq *fp)
        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));
@@ -477,7 +464,7 @@ ip_dooptions(m)
        register struct in_ifaddr *ia;
        int opt, optlen, cnt, off, code, type, forward = 0;
        struct in_addr *sin, dst;
-typedef u_int32_t n_time;
+typedef uint32_t n_time;
        n_time ntime;
 
        dst = ip->ip_dst;
@@ -531,7 +518,7 @@ typedef u_int32_t n_time;
                                 */
                                break;
                        }
-                       off--;                  / * 0 origin *  /
+                        off--; /* 0 origin */
                        if (off > optlen - sizeof(struct in_addr)) {
                                /*
                                 * End of source route.  Should be for us.
@@ -574,7 +561,7 @@ typedef u_int32_t n_time;
                        /*
                         * 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,