[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/17] slirp: Adding family argument to tcp_fconnect(
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 13/17] slirp: Adding family argument to tcp_fconnect() |
Date: |
Tue, 2 Feb 2016 10:36:17 +0800 |
From: Guillaume Subiron <address@hidden>
This patch simply adds a sa_family_t argument to remove the hardcoded
"AF_INET" in the call of qemu_socket().
This prepares for IPv6 support.
Signed-off-by: Guillaume Subiron <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
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 ec0a4c2..fcd4a05 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -327,7 +327,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 5e2773c..f24e706 100644
--- a/slirp/tcp_input.c
+++ b/slirp/tcp_input.c
@@ -584,7 +584,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;
--
2.5.0
- [Qemu-devel] [PULL 03/17] net: cadence_gem: check packet size in gem_recieve, (continued)
- [Qemu-devel] [PULL 03/17] net: cadence_gem: check packet size in gem_recieve, Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 04/17] cadence_gem: fix buffer overflow, Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 05/17] slirp: goto bad in udp_input if sosendto fails, Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 06/17] slirp: Generalizing and neutralizing ARP code, Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 07/17] slirp: Adding address family switch for produced frames, Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 08/17] slirp: Make Socket structure IPv6 compatible, Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 09/17] slirp: Factorizing address translation, Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 10/17] slirp: Factorizing and cleaning solookup(), Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 11/17] slirp: Add sockaddr_equal, make solookup family-agnostic, Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 12/17] slirp: Make udp_attach IPv6 compatible, Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 13/17] slirp: Adding family argument to tcp_fconnect(),
Jason Wang <=
- [Qemu-devel] [PULL 14/17] e1000: eliminate infinite loops on out-of-bounds transfer start, Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 15/17] net: netmap: use nm_open() to open netmap ports, Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 16/17] net: always walk through filters in reverse if traffic is egress, Jason Wang, 2016/02/01
- [Qemu-devel] [PULL 17/17] net/filter: Fix the output information for command 'info network', Jason Wang, 2016/02/01
- Re: [Qemu-devel] [PULL 00/17] Net patches, Peter Maydell, 2016/02/02