Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / slirp / main.h

diff --git a/slirp/main.h b/slirp/main.h
index 9cd8758..ed51385 100644 (file)
--- a/slirp/main.h
+++ b/slirp/main.h
@@ -42,9 +42,10 @@ extern char *username;
 extern char *socket_path;
 extern int towrite_max;
 extern int ppp_exit;
-extern int so_options;
 extern int tcp_keepintvl;
 extern uint8_t client_ethaddr[6];
+extern const char *slirp_special_ip;
+extern int slirp_restrict;
 
 #define PROTO_SLIP 0x1
 #ifdef USE_PPP
@@ -52,3 +53,4 @@ extern uint8_t client_ethaddr[6];
 #endif
 
 void if_encap(const uint8_t *ip_data, int ip_data_len);
+ssize_t slirp_send(struct socket *so, const void *buf, size_t len, int flags);