diff options
| author | Guillaume Subiron <maethor@subiron.org> | 2016-03-15 10:31:21 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-03-15 10:35:14 +0100 |
| commit | 9dfbf250d2a57adea15e42eed44ae35cb32d7597 (patch) | |
| tree | a5bbf8bfe64d593175cf0400fd7b2ce0fdcf4465 /slirp/tcp_timer.c | |
| parent | 98c63057d2144fb81681580cd84c13c93794c96e (diff) | |
| download | qemu-9dfbf250d2a57adea15e42eed44ae35cb32d7597.tar.gz | |
slirp: Generalizing and neutralizing various TCP functions before adding IPv6 stuff
Basically, this patch adds some switch in various TCP functions to
prepare them for the IPv6 case.
To have something to "switch" in tcp_input() and tcp_respond(), a new
argument is used to give them the sa_family of the addresses they are
working on.
This patch does not include the entailed reindentation, to make proofread
easier. Reindentation is adressed in the following no-op patch.
Signed-off-by: Guillaume Subiron <maethor@subiron.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'slirp/tcp_timer.c')
| -rw-r--r-- | slirp/tcp_timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/slirp/tcp_timer.c b/slirp/tcp_timer.c index 1214c2e6fa..8f5dd772ad 100644 --- a/slirp/tcp_timer.c +++ b/slirp/tcp_timer.c @@ -278,7 +278,8 @@ tcp_timers(register struct tcpcb *tp, int timer) * correspondent TCP to respond. */ tcp_respond(tp, &tp->t_template, (struct mbuf *)NULL, - tp->rcv_nxt, tp->snd_una - 1, 0); + tp->rcv_nxt, tp->snd_una - 1, 0, + tp->t_socket->so_ffamily); tp->t_timer[TCPT_KEEP] = TCPTV_KEEPINTVL; } else tp->t_timer[TCPT_KEEP] = TCPTV_KEEP_IDLE; |