mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
Version: GnuPG v1
 
 iQEcBAABAgAGBQJb7jvSAAoJEO8Ells5jWIRizgH/0rSNEVWis7Cvf1BxXcuAbkY
 S3LYgBxVJUhvsjB5Mx7/FRYWSUB/D7Q35cZMFNU66G5ZOAm7YlF7Q7XHDuCWd+mH
 U+HhRKFZLe6YFVgsukLBui+8GRxD+H0Olpd2i3W7+pYC+oNTeVDhAio/K3d4yv4G
 oVM+Lpo3O+NE3nPIcnpKFHOwRcPYnX2bNR+QinKhpUYFwzcKDOggqvI/62S58zgk
 Kh6uYixxtcGfMXx5utNmOzF2m25AfcsC6oRbSDUnQCeRQgIz82OA1haqFhrw+sFK
 YoBJEGHw1ua9C3CuaU60EENEdAs5VvNauBdpuX7jj3BrgP9u06exbxwVRFprLKY=
 =c83S
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging

# gpg: Signature made Fri 16 Nov 2018 03:38:58 GMT
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  net/filter-rewriter.c: Fix coverity static analysis issue

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-11-16 10:01:04 +00:00
commit 6ea4161e64
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/filter-rewriter.c
View File

@ -155,12 +155,13 @@ static int handle_primary_tcp_pkt(RewriterState *rf,
* Active close step 2.
*/
if (conn->tcp_state == TCPS_FIN_WAIT_1) {
conn->tcp_state = TCPS_TIME_WAIT;
/*
* For simplify implementation, we needn't wait 2MSL time
* in filter rewriter. Because guest kernel will track the
* TCP status and wait 2MSL time, if client resend the FIN
* packet, guest will apply the last ACK too.
* So, we skip the TCPS_TIME_WAIT state here and go straight
* to TCPS_CLOSED state.
*/
conn->tcp_state = TCPS_CLOSED;
g_hash_table_remove(rf->connection_track_table, key);