diff --git a/dp-core/vr_mirror.c b/dp-core/vr_mirror.c index 095178669..986df73b2 100644 --- a/dp-core/vr_mirror.c +++ b/dp-core/vr_mirror.c @@ -350,11 +350,9 @@ vr_mirror(struct vrouter *router, uint8_t mirror_id, struct vr_packet *pkt, { bool reset = true; unsigned int captured_len, clone_len = 0, mirror_md_len = 0; - unsigned long sec, usec; void *mirror_md; unsigned char *buf; struct vr_nexthop *nh, *pkt_nh; - struct vr_pcap *pcap; struct vr_mirror_entry *mirror; struct vr_mirror_meta_entry *mme; unsigned char default_mme[2] = {0xff, 0x0}; @@ -397,8 +395,6 @@ vr_mirror(struct vrouter *router, uint8_t mirror_id, struct vr_packet *pkt, if (mirror->mir_flags & VR_MIRROR_FLAG_DYNAMIC) { - clone_len += sizeof(struct vr_pcap); - if (mtype == MIRROR_TYPE_ACL) { if (fmd->fmd_flow_index >= 0) { mme = vr_mirror_meta_entry_get(router, fmd->fmd_flow_index); @@ -449,7 +445,6 @@ vr_mirror(struct vrouter *router, uint8_t mirror_id, struct vr_packet *pkt, clone_len += pkt_nh->nh_encap_len; - if (vr_pcow(pkt, clone_len)) goto fail; clone_len = 0; @@ -471,27 +466,10 @@ vr_mirror(struct vrouter *router, uint8_t mirror_id, struct vr_packet *pkt, captured_len = htonl(pkt_len(pkt)); if (mirror_md_len) { - buf = pkt_push(pkt, mirror_md_len); if (!buf) goto fail; memcpy(buf, mirror_md, mirror_md_len); - - /* Add the pcap header */ - pcap = (struct vr_pcap *)pkt_push(pkt, sizeof(struct vr_pcap)); - if (!pcap) - goto fail; - - pcap->pcap_incl_len = captured_len; - pcap->pcap_orig_len = captured_len; - - vr_get_time(&sec, &usec); - - pcap->pcap_ts_sec = sec; - pcap->pcap_ts_usec = usec; - - pcap->pcap_ts_sec = htonl(pcap->pcap_ts_sec); - pcap->pcap_ts_usec = htonl(pcap->pcap_ts_usec); } if (nh->nh_vrf >= 0) diff --git a/include/vr_mirror.h b/include/vr_mirror.h index 4e994efe6..40601a9e3 100644 --- a/include/vr_mirror.h +++ b/include/vr_mirror.h @@ -22,8 +22,7 @@ typedef enum { /* Mirror packet can be either MPLSoGre or MPLSoUDP. Lets calculate the * highest for head space */ -#define VR_MIRROR_PKT_HEAD_SPACE (sizeof(struct vr_pcap) + \ - sizeof(struct vr_udp) + sizeof(struct vr_ip6) + \ +#define VR_MIRROR_PKT_HEAD_SPACE (sizeof(struct vr_udp) + sizeof(struct vr_ip6) + \ VR_MPLS_HDR_LEN + sizeof(struct vr_udp) + sizeof(struct vr_ip) + \ VR_ETHER_HLEN)