diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2009-06-24 14:42:29 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-06-29 08:52:45 -0500 |
| commit | f932b6ce717e65687c3095e3e41a6c18972f996c (patch) | |
| tree | 44d74bc4164e3c43d2ac9a7b372b842cd8db2537 /slirp/slirp.c | |
| parent | 3c6a05803c8f33b2ce6f704df87c98983029befd (diff) | |
| download | qemu-f932b6ce717e65687c3095e3e41a6c18972f996c.tar.gz | |
slirp: Prepare for persistent socket state flags
This prepares for adding flags to socket.so_state that must not be
removed during the lifetime of a socket.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'slirp/slirp.c')
| -rw-r--r-- | slirp/slirp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/slirp/slirp.c b/slirp/slirp.c index ab0a8548aa..08c10f2b36 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -495,7 +495,8 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds) continue; /* else failed */ - so->so_state = SS_NOFDREF; + so->so_state &= SS_PERSISTENT_MASK; + so->so_state |= SS_NOFDREF; } /* else so->so_state &= ~SS_ISFCONNECTING; */ @@ -529,7 +530,8 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds) continue; /* Still connecting, continue */ /* else failed */ - so->so_state = SS_NOFDREF; + so->so_state &= SS_PERSISTENT_MASK; + so->so_state |= SS_NOFDREF; /* tcp_input will take care of it */ } else { @@ -540,7 +542,8 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds) errno == EINPROGRESS || errno == ENOTCONN) continue; /* else failed */ - so->so_state = SS_NOFDREF; + so->so_state &= SS_PERSISTENT_MASK; + so->so_state |= SS_NOFDREF; } else so->so_state &= ~SS_ISFCONNECTING; |