Merge remote-tracking branch 'quintela/thread-20121220.next' into staging

[qemu.git] / slirp / tftp.h

diff --git a/slirp/tftp.h b/slirp/tftp.h
index b9f0847eb9310177a035d267f93ad54885e8e53d..87adeb533352e6736422ec291df3e6ceae3d9a01 100644 (file)
--- a/slirp/tftp.h
+++ b/slirp/tftp.h
@@ -1,4 +1,6 @@
 /* tftp defines */
+#ifndef SLIRP_TFTP_H
+#define SLIRP_TFTP_H 1
 
 #define TFTP_SESSIONS_MAX 3
 
@@ -26,18 +28,22 @@ struct tftp_t {
       uint16_t tp_error_code;
       uint8_t tp_msg[512];
     } tp_error;
-    uint8_t tp_buf[512 + 2];
+    char tp_buf[512 + 2];
   } x;
 };
 
 struct tftp_session {
     Slirp *slirp;
     char *filename;
+    int fd;
 
     struct in_addr client_ip;
     uint16_t client_port;
+    uint32_t block_nr;
 
     int timestamp;
 };
 
 void tftp_input(struct mbuf *m);
+
+#endif