diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c index 09571bcd6b..48016a9f85 100644 --- a/slirp/ip6_icmp.c +++ b/slirp/ip6_icmp.c @@ -9,7 +9,6 @@ #include "qemu/timer.h" #include "qemu/error-report.h" #include "qemu/log.h" -#include #define NDP_Interval g_rand_int_range(slirp->grand, \ NDP_MinRtrAdvInterval, NDP_MaxRtrAdvInterval) diff --git a/slirp/ip_input.c b/slirp/ip_input.c index cdd54833a3..34fba2b7dd 100644 --- a/slirp/ip_input.c +++ b/slirp/ip_input.c @@ -40,7 +40,6 @@ #include "qemu/osdep.h" #include -#include #include "ip_icmp.h" static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp); diff --git a/slirp/misc.c b/slirp/misc.c index 2fbd04856a..1a0ea1be4e 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -60,27 +60,6 @@ int add_exec(struct ex_list **ex_ptr, int do_pty, char *exec, return 0; } -#ifndef HAVE_STRERROR - -/* - * For systems with no strerror - */ - -extern int sys_nerr; -extern char *sys_errlist[]; - -char * -strerror(error) - int error; -{ - if (error < sys_nerr) - return sys_errlist[error]; - else - return "Unknown error."; -} - -#endif - #ifdef _WIN32 diff --git a/slirp/slirp.h b/slirp/slirp.h index 203deec480..e37387605b 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -23,11 +23,6 @@ typedef char *caddr_t; # include #endif - -#ifndef HAVE_MEMMOVE -#define memmove(x, y, z) bcopy(y, x, z) -#endif - #ifndef _WIN32 #include #endif @@ -37,17 +32,6 @@ typedef char *caddr_t; #include #endif -/* Systems lacking strdup() definition in . */ -#if defined(ultrix) -char *strdup(const char *); -#endif - -/* Systems lacking malloc() definition in . */ -#if defined(ultrix) || defined(hcx) -void *malloc(size_t arg); -void free(void *ptr); -#endif - #ifndef NO_UNIX_SOCKETS #include #endif @@ -74,10 +58,6 @@ void free(void *ptr); # include #endif -#ifdef USE_PPP -#include -#endif - /* Avoid conflicting with the libc insque() and remque(), which have different prototypes. */ #define insque slirp_insque @@ -112,10 +92,6 @@ void free(void *ptr); #include "if.h" #include "main.h" #include "misc.h" -#ifdef USE_PPP -#include "ppp/pppd.h" -#include "ppp/ppp.h" -#endif #include "bootp.h" #include "tftp.h" @@ -253,30 +229,12 @@ extern Slirp *slirp_instance; #define NULL (void *)0 #endif -#ifndef FULL_BOLT void if_start(Slirp *); -#else -void if_start(struct ttys *); -#endif - -#ifndef HAVE_STRERROR - char *strerror(int error); -#endif - -#ifndef HAVE_INDEX - char *index(const char *, int); -#endif - -#ifndef HAVE_GETHOSTID - long gethostid(void); -#endif #ifndef _WIN32 #include #endif -#define DEFAULT_BAUD 115200 - #define SO_OPTIONS DO_KEEPALIVE #define TCP_MAXIDLE (TCPTV_KEEPCNT * TCPTV_KEEPINTVL) @@ -334,14 +292,6 @@ int tcp_emu(struct socket *, struct mbuf *); int tcp_ctl(struct socket *); struct tcpcb *tcp_drop(struct tcpcb *tp, int err); -#ifdef USE_PPP -#define MIN_MRU MINMRU -#define MAX_MRU MAXMRU -#else -#define MIN_MRU 128 -#define MAX_MRU 16384 -#endif - #ifndef _WIN32 #define min(x,y) ((x) < (y) ? (x) : (y)) #define max(x,y) ((x) > (y) ? (x) : (y)) diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h index 896d8022eb..c59f655207 100644 --- a/slirp/slirp_config.h +++ b/slirp/slirp_config.h @@ -9,19 +9,6 @@ /* Define to 1 if you want KEEPALIVE timers */ #define DO_KEEPALIVE 0 -/* Define to MAX interfaces you expect to use at once */ -/* MAX_INTERFACES determines the max. TOTAL number of interfaces (SLIP and PPP) */ -/* MAX_PPP_INTERFACES determines max. number of PPP interfaces */ -#define MAX_INTERFACES 1 -#define MAX_PPP_INTERFACES 1 - -/* Define if you want slirp's socket in /tmp */ -/* XXXXXX Do this in ./configure */ -#undef USE_TMPSOCKET - -/* Define if you want slirp to use cfsetXspeed() on the terminal */ -#undef DO_CFSETSPEED - /* Define this if you want slirp to write to the tty as fast as it can */ /* This should only be set if you are using load-balancing, slirp does a */ /* pretty good job on single modems already, and seting this will make */ @@ -29,34 +16,12 @@ /* XXXXX Talk about having fast modem as unit 0 */ #undef FULL_BOLT -/* - * Define if you want slirp to use less CPU - * You will notice a small lag in interactive sessions, but it's not that bad - * Things like Netscape/ftp/etc. are completely unaffected - * This is mainly for sysadmins who have many slirp users - */ -#undef USE_LOWCPU - -/* Define this if your compiler doesn't like prototypes */ -#ifndef __STDC__ -#define NO_PROTOTYPES -#endif - /*********************************************************/ /* * Autoconf defined configuration options * You shouldn't need to touch any of these */ -/* Ignore this */ -#undef DUMMY_PPP - -/* Define if you have unistd.h */ -#define HAVE_UNISTD_H - -/* Define if you have stdlib.h */ -#define HAVE_STDLIB_H - /* Define if you have sys/ioctl.h */ #undef HAVE_SYS_IOCTL_H #ifndef _WIN32 @@ -69,13 +34,6 @@ #define HAVE_SYS_FILIO_H #endif -/* Define if you have strerror */ -#define HAVE_STRERROR - -/* Define according to how time.h should be included */ -#define TIME_WITH_SYS_TIME 0 -#undef HAVE_SYS_TIME_H - /* Define if you have sys/bitypes.h */ #undef HAVE_SYS_BITYPES_H @@ -100,9 +58,6 @@ #define HAVE_SYS_SELECT_H #endif -/* Define if you have strings.h */ -#define HAVE_STRING_H - /* Define if you have arpa/inet.h */ #undef HAVE_ARPA_INET_H #ifndef _WIN32 @@ -115,71 +70,17 @@ /* Define if you have sys/stropts.h */ #undef HAVE_SYS_STROPTS_H -/* Define to whatever your compiler thinks inline should be */ -//#define inline inline - -/* Define to whatever your compiler thinks const should be */ -//#define const const - -/* Define if your compiler doesn't like prototypes */ -#undef NO_PROTOTYPES - -/* Define to sizeof(char) */ -#define SIZEOF_CHAR 1 - -/* Define to sizeof(short) */ -#define SIZEOF_SHORT 2 - -/* Define to sizeof(int) */ -#define SIZEOF_INT 4 - /* Define to sizeof(char *) */ #define SIZEOF_CHAR_P (HOST_LONG_BITS / 8) -/* Define if you have random() */ -#undef HAVE_RANDOM - -/* Define if you have srandom() */ -#undef HAVE_SRANDOM - /* Define if you have inet_aton */ #undef HAVE_INET_ATON #ifndef _WIN32 #define HAVE_INET_ATON #endif -/* Define if you have setenv */ -#undef HAVE_SETENV - -/* Define if you have index() */ -#define HAVE_INDEX - -/* Define if you have bcmp() */ -#undef HAVE_BCMP - -/* Define if you have drand48 */ -#undef HAVE_DRAND48 - -/* Define if you have memmove */ -#define HAVE_MEMMOVE - -/* Define if you have gethostid */ -#define HAVE_GETHOSTID - /* Define if you DON'T have unix-domain sockets */ #undef NO_UNIX_SOCKETS #ifdef _WIN32 #define NO_UNIX_SOCKETS #endif - -/* Define if you have revoke() */ -#undef HAVE_REVOKE - -/* Define if you have the sysv method of opening pty's (/dev/ptmx, etc.) */ -#undef HAVE_GRANTPT - -/* Define if you have fchmod */ -#undef HAVE_FCHMOD - -/* Define if you have */ -#undef HAVE_SYS_TYPES32_H diff --git a/slirp/udp6.c b/slirp/udp6.c index a23026f2e4..94efb13240 100644 --- a/slirp/udp6.c +++ b/slirp/udp6.c @@ -6,7 +6,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "slirp.h" -#include "qemu/osdep.h" #include "udp.h" void udp6_input(struct mbuf *m)