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

net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare 



COLO-Proxy just focus on packet payload, so we skip vnet header.

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

net/colo-compare.c

+6 −2
Original line number Diff line number Diff line
@@ -201,8 +201,11 @@ static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset) 
                                   sec_ip_src, sec_ip_dst);

    }



    offset = ppkt->vnet_hdr_len + offset;



    if (ppkt->size == spkt->size) {

        return memcmp(ppkt->data + offset, spkt->data + offset,

        return memcmp(ppkt->data + offset,

                      spkt->data + offset,

                      spkt->size - offset);

    } else {

        trace_colo_compare_main("Net packet size are not the same");
@@ -261,8 +264,9 @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt) 
     */

    if (ptcp->th_off > 5) {

        ptrdiff_t tcp_offset;



        tcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data

                     + (ptcp->th_off * 4);

                     + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;

        res = colo_packet_compare_common(ppkt, spkt, tcp_offset);

    } else if (ptcp->th_sum == stcp->th_sum) {

        res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN);