From 0d62c4cfe21752df4c1d6e2c2398f15d5eaa794a Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 24 Jun 2009 14:42:29 +0200 Subject: slirp: Drop dead code After all its years inside the qemu tree, there is no point in keeping the dead code paths of slirp. This patch is a first round of removing usually commented out code parts. More cleanups need to follow (and maybe finally a proper reindention). Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- slirp/ip_input.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'slirp/ip_input.c') diff --git a/slirp/ip_input.c b/slirp/ip_input.c index 7a3c88b549..1fdd8d6bdc 100644 --- a/slirp/ip_input.c +++ b/slirp/ip_input.c @@ -164,16 +164,6 @@ ip_input(struct mbuf *m) goto bad; } - /* - * Process options and, if not destined for us, - * ship it on. ip_dooptions returns 1 when an - * error was detected (causing an icmp message - * to be sent and the original packet to be freed). - */ -/* We do no IP options */ -/* if (hlen > sizeof (struct ip) && ip_dooptions(m)) - * goto next; - */ /* * If offset or IP_MF are set, must reassemble. * Otherwise, nothing need be done. @@ -396,9 +386,6 @@ insert: q = (struct ipasfrag *)(m->m_ext + delta); } - /* DEBUG_ARG("ip = %lx", (long)ip); - * ip=(struct ipasfrag *)m->m_data; */ - ip = fragtoip(q); ip->ip_len = next; ip->ip_tos &= ~1; @@ -505,7 +492,6 @@ ip_dooptions(m) register u_char *cp; register struct ip_timestamp *ipt; register struct in_ifaddr *ia; -/* int opt, optlen, cnt, off, code, type = ICMP_PARAMPROB, forward = 0; */ int opt, optlen, cnt, off, code, type, forward = 0; struct in_addr *sin, dst; typedef u_int32_t n_time; @@ -683,9 +669,6 @@ typedef u_int32_t n_time; } return (0); bad: - /* ip->ip_len -= ip->ip_hl << 2; XXX icmp_error adds in hdr length */ - -/* Not yet */ icmp_error(m, type, code, 0, 0); STAT(ipstat.ips_badoptions++); -- cgit v1.2.3