Commit 1723a7f7 authored by Zhang Chen's avatar Zhang Chen Committed by Jason Wang
Browse files

COLO-compare: Fix icmp and udp compare different packet always dump bug 



Signed-off-by: default avatarZhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 6efeb328

net/colo-compare.c

+12 −6
Original line number Diff line number Diff line
@@ -279,9 +279,13 @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt) 


    if (ret) {

        trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size);

        qemu_hexdump((char *)ppkt->data, stderr, "colo-compare", ppkt->size);

        trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size);

        qemu_hexdump((char *)spkt->data, stderr, "colo-compare", spkt->size);

        if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) {

            qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt",

                         ppkt->size);

            qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt",

                         spkt->size);

        }

    }



    return ret;
@@ -311,12 +315,14 @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt) 
                                   network_header_length + ETH_HLEN)) {

        trace_colo_compare_icmp_miscompare("primary pkt size",

                                           ppkt->size);

        qemu_hexdump((char *)ppkt->data, stderr, "colo-compare",

                     ppkt->size);

        trace_colo_compare_icmp_miscompare("Secondary pkt size",

                                           spkt->size);

        qemu_hexdump((char *)spkt->data, stderr, "colo-compare",

        if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) {

            qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt",

                         ppkt->size);

            qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt",

                         spkt->size);

        }

        return -1;

    } else {

        return 0;