diff options
| author | Zhang Chen <zhangchen.fnst@cn.fujitsu.com> | 2017-03-09 15:40:07 +0800 |
|---|---|---|
| committer | Jason Wang <jasowang@redhat.com> | 2017-03-14 15:39:55 +0800 |
| commit | e630b2bf7c8a7900d1e19ca006e6335df24f2928 (patch) | |
| tree | e561ddbc2aff3bbf46e18a97316054c870ad617a | |
| parent | 7ec7ae4b973d1471f6f39fc2b6481f69c2b39593 (diff) | |
| download | qemu-e630b2bf7c8a7900d1e19ca006e6335df24f2928.zip qemu-e630b2bf7c8a7900d1e19ca006e6335df24f2928.tar.gz qemu-e630b2bf7c8a7900d1e19ca006e6335df24f2928.tar.bz2 | |
COLO-compare: Fix trace_event print bug
Because of inet_ntoa() return a statically allocated buffer,
subsequent calls will overwrite, So we fix this bug.
Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
| -rw-r--r-- | net/colo-compare.c | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/net/colo-compare.c b/net/colo-compare.c index 282727b..54e6d40 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -182,10 +182,18 @@ static int packet_enqueue(CompareState *s, int mode) */ static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset) { - trace_colo_compare_ip_info(ppkt->size, inet_ntoa(ppkt->ip->ip_src), - inet_ntoa(ppkt->ip->ip_dst), spkt->size, - inet_ntoa(spkt->ip->ip_src), - inet_ntoa(spkt->ip->ip_dst)); + if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { + char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20]; + + strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src)); + strcpy(pri_ip_dst, inet_ntoa(ppkt->ip->ip_dst)); + strcpy(sec_ip_src, inet_ntoa(spkt->ip->ip_src)); + strcpy(sec_ip_dst, inet_ntoa(spkt->ip->ip_dst)); + + trace_colo_compare_ip_info(ppkt->size, pri_ip_src, + pri_ip_dst, spkt->size, + sec_ip_src, sec_ip_dst); + } if (ppkt->size == spkt->size) { return memcmp(ppkt->data + offset, spkt->data + offset, @@ -336,10 +344,19 @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt) static int colo_packet_compare_other(Packet *spkt, Packet *ppkt) { trace_colo_compare_main("compare other"); - trace_colo_compare_ip_info(ppkt->size, inet_ntoa(ppkt->ip->ip_src), - inet_ntoa(ppkt->ip->ip_dst), spkt->size, - inet_ntoa(spkt->ip->ip_src), - inet_ntoa(spkt->ip->ip_dst)); + if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { + char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20]; + + strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src)); + strcpy(pri_ip_dst, inet_ntoa(ppkt->ip->ip_dst)); + strcpy(sec_ip_src, inet_ntoa(spkt->ip->ip_src)); + strcpy(sec_ip_dst, inet_ntoa(spkt->ip->ip_dst)); + + trace_colo_compare_ip_info(ppkt->size, pri_ip_src, + pri_ip_dst, spkt->size, + sec_ip_src, sec_ip_dst); + } + return colo_packet_compare_common(ppkt, spkt, 0); } |