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/slirp.c | |
| parent | 98c63057d2144fb81681580cd84c13c93794c96e (diff) | |
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/slirp.c')
| -rw-r--r-- | slirp/slirp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/slirp/slirp.c b/slirp/slirp.c index dd4f6d22eb..50b36f4126 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -586,7 +586,8 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error) /* * Continue tcp_input */ - tcp_input((struct mbuf *)NULL, sizeof(struct ip), so); + tcp_input((struct mbuf *)NULL, sizeof(struct ip), so, + so->so_ffamily); /* continue; */ } else { ret = sowrite(so); @@ -635,7 +636,8 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error) } } - tcp_input((struct mbuf *)NULL, sizeof(struct ip), so); + tcp_input((struct mbuf *)NULL, sizeof(struct ip), so, + so->so_ffamily); } /* SS_ISFCONNECTING */ #endif } |