[Qemu-devel] [PULL] Net patches

[Qemu-devel] [PULL] Net patches

[Jason Wang]

The following changes since commit d835c6192495dc5b2c3a15a0761eb57d8d310828:

  Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-11-15-1' into staging (2018-11-15 14:18:25 +0000)

are available in the git repository at:

  https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to 013a62020a92f371555c67342424f2f944b62be4:

  net/filter-rewriter.c: Fix coverity static analysis issue (2018-11-16 11:08:26 +0800)

----------------------------------------------------------------

----------------------------------------------------------------
Zhang Chen (1):
      net/filter-rewriter.c: Fix coverity static analysis issue

 net/filter-rewriter.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[Qemu-devel] [PULL] net/filter-rewriter.c: Fix coverity static analysis issue

[Jason Wang]

From: Zhang Chen <zhangckid@gmail.com>

The original code just follow the TCP state diagram,
but in this case, we can skip the TCPS_TIME_WAIT state to simplify
the implementation.

Signed-off-by: Zhang Chen <zhangckid@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/filter-rewriter.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index bb8f4d9..2e26839 100644
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -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);
-- 
2.5.0

Re: [Qemu-devel] [PULL] Net patches

[Peter Maydell]

On 16 November 2018 at 03:43, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit d835c6192495dc5b2c3a15a0761eb57d8d310828:
>
>   Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-11-15-1' into staging (2018-11-15 14:18:25 +0000)
>
> are available in the git repository at:
>
>   https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 013a62020a92f371555c67342424f2f944b62be4:
>
>   net/filter-rewriter.c: Fix coverity static analysis issue (2018-11-16 11:08:26 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Zhang Chen (1):
>       net/filter-rewriter.c: Fix coverity static analysis issue
>
>  net/filter-rewriter.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)


Applied, thanks.

-- PMM