| Message ID | 1449792930-27293-8-git-send-email-samuel.thibault@ens-lyon.org |
|---|---|
| State | New |
| Headers | show |
On 11/12/15 01:15, Samuel Thibault wrote: > From: Guillaume Subiron <maethor@subiron.org> > > This patch simply adds a sa_family_t argument to remove the hardcoded > "AF_INET" in the call of qemu_socket(). > > Signed-off-by: Guillaume Subiron <maethor@subiron.org> > Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > slirp/slirp.h | 2 +- > slirp/tcp_input.c | 2 +- > slirp/tcp_subr.c | 5 +++-- > 3 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/slirp/slirp.h b/slirp/slirp.h > index 6589d7e..5b810e5 100644 > --- a/slirp/slirp.h > +++ b/slirp/slirp.h > @@ -332,7 +332,7 @@ void tcp_respond(struct tcpcb *, register struct tcpiphdr *, register struct mbu > struct tcpcb * tcp_newtcpcb(struct socket *); > struct tcpcb * tcp_close(register struct tcpcb *); > void tcp_sockclosed(struct tcpcb *); > -int tcp_fconnect(struct socket *); > +int tcp_fconnect(struct socket *, sa_family_t af); > void tcp_connect(struct socket *); > int tcp_attach(struct socket *); > uint8_t tcp_tos(struct socket *); > diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c > index 8c4fa62..079eeb9 100644 > --- a/slirp/tcp_input.c > +++ b/slirp/tcp_input.c > @@ -581,7 +581,7 @@ findso: > goto cont_input; > } > > - if ((tcp_fconnect(so) == -1) && > + if ((tcp_fconnect(so, so->so_ffamily) == -1) && > #if defined(_WIN32) > socket_error() != WSAEWOULDBLOCK > #else > diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c > index 76c716f..8ec2729 100644 > --- a/slirp/tcp_subr.c > +++ b/slirp/tcp_subr.c > @@ -324,14 +324,15 @@ tcp_sockclosed(struct tcpcb *tp) > * nonblocking. Connect returns after the SYN is sent, and does > * not wait for ACK+SYN. > */ > -int tcp_fconnect(struct socket *so) > +int tcp_fconnect(struct socket *so, sa_family_t af) > { > int ret=0; > > DEBUG_CALL("tcp_fconnect"); > DEBUG_ARG("so = %p", so); > > - if( (ret = so->s = qemu_socket(AF_INET,SOCK_STREAM,0)) >= 0) { > + ret = so->s = qemu_socket(af, SOCK_STREAM, 0); > + if (ret >= 0) { > int opt, s=so->s; > struct sockaddr_storage addr; > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/slirp/slirp.h b/slirp/slirp.h index 6589d7e..5b810e5 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -332,7 +332,7 @@ void tcp_respond(struct tcpcb *, register struct tcpiphdr *, register struct mbu struct tcpcb * tcp_newtcpcb(struct socket *); struct tcpcb * tcp_close(register struct tcpcb *); void tcp_sockclosed(struct tcpcb *); -int tcp_fconnect(struct socket *); +int tcp_fconnect(struct socket *, sa_family_t af); void tcp_connect(struct socket *); int tcp_attach(struct socket *); uint8_t tcp_tos(struct socket *); diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index 8c4fa62..079eeb9 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -581,7 +581,7 @@ findso: goto cont_input; } - if ((tcp_fconnect(so) == -1) && + if ((tcp_fconnect(so, so->so_ffamily) == -1) && #if defined(_WIN32) socket_error() != WSAEWOULDBLOCK #else diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index 76c716f..8ec2729 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -324,14 +324,15 @@ tcp_sockclosed(struct tcpcb *tp) * nonblocking. Connect returns after the SYN is sent, and does * not wait for ACK+SYN. */ -int tcp_fconnect(struct socket *so) +int tcp_fconnect(struct socket *so, sa_family_t af) { int ret=0; DEBUG_CALL("tcp_fconnect"); DEBUG_ARG("so = %p", so); - if( (ret = so->s = qemu_socket(AF_INET,SOCK_STREAM,0)) >= 0) { + ret = so->s = qemu_socket(af, SOCK_STREAM, 0); + if (ret >= 0) { int opt, s=so->s; struct sockaddr_storage addr;