slirp: Add IPv6 support to the TFTP code

Add the handler code for incoming TFTP packets to udp6_input(),
and make sure that the TFTP code can send packets with both,
udp_output() and udp6_output() by introducing a wrapper function
called tftp_udp_output().

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Thomas Huth 2016-03-15 10:31:23 +01:00 committed by Samuel Thibault
parent 7aac531ef2
commit fad7fb9ccd
4 changed files with 100 additions and 72 deletions

View file

@ -16,7 +16,6 @@
#define TFTP_FILENAME_MAX 512
struct tftp_t {
struct ip ip;
struct udphdr udp;
uint16_t tp_op;
union {
@ -30,20 +29,20 @@ struct tftp_t {
} tp_error;
char tp_buf[512 + 2];
} x;
};
} __attribute__((packed));
struct tftp_session {
Slirp *slirp;
char *filename;
int fd;
struct in_addr client_ip;
struct sockaddr_storage client_addr;
uint16_t client_port;
uint32_t block_nr;
int timestamp;
};
void tftp_input(struct mbuf *m);
void tftp_input(struct sockaddr_storage *srcsas, struct mbuf *m);
#endif