Changeset aceeda6
- Timestamp:
- 01/07/19 10:36:22 (2 years ago)
- Branches:
- develop
- Children:
- 3dc6ed6
- Parents:
- 89ed4a0
- git-author:
- Jacob Van Walraven <jcv9@…> (12/17/18 11:55:21)
- git-committer:
- Jacob Van Walraven <jcv9@…> (01/07/19 10:36:22)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_pcapng.c
rb39eaee raceeda6 226 226 227 227 static inline uint32_t pcapng_get_record_type(const libtrace_packet_t *packet) { 228 229 228 uint32_t *btype = (uint32_t *)packet->header; 229 230 if (DATA(packet->trace) == NULL) { 231 return *btype; 232 } 230 233 231 234 if (DATA(packet->trace)->byteswapped) … … 234 237 } 235 238 236 static inline uint32_t pcapng_swap32(libtrace_packet_t *packet, uint32_t value) { 237 if (DATAOUT(packet->trace)->byteswapped) { 239 static inline uint32_t pcapng_swap32(libtrace_out_t *libtrace, uint32_t value) { 240 if (DATAOUT(libtrace) == NULL) { 241 return value; 242 } 243 244 if (DATAOUT(libtrace)->byteswapped) { 238 245 return byteswap32(value); 239 246 } else { … … 241 248 } 242 249 } 243 static inline uint32_t pcapng_swap16(libtrace_packet_t *packet, uint32_t value) { 244 if (DATAOUT(packet->trace)->byteswapped) { 250 static inline uint32_t pcapng_swap16(libtrace_out_t *libtrace, uint32_t value) { 251 if (DATAOUT(libtrace) == NULL) { 252 return value; 253 } 254 255 if (DATAOUT(libtrace)->byteswapped) { 245 256 return byteswap16(value); 246 257 } else { … … 250 261 static inline uint32_t pcapng_get_blocklen(const libtrace_packet_t *packet) { 251 262 struct pcapng_peeker *hdr = (struct pcapng_peeker *)packet->buffer; 263 264 if (DATA(packet->trace) == NULL) { 265 return hdr->blocklen; 266 } 252 267 253 268 if (DATA(packet->trace)->byteswapped) { … … 671 686 /* Create section block */ 672 687 pcapng_sec_t sechdr; 673 sechdr.blocktype = pcapng_swap32( packet, PCAPNG_SECTION_TYPE);674 sechdr.blocklen = pcapng_swap32( packet, 28);675 sechdr.ordering = pcapng_swap32( packet, 0x1A2B3C4D);676 sechdr.majorversion = pcapng_swap16( packet, 1);688 sechdr.blocktype = pcapng_swap32(libtrace, PCAPNG_SECTION_TYPE); 689 sechdr.blocklen = pcapng_swap32(libtrace, 28); 690 sechdr.ordering = pcapng_swap32(libtrace, 0x1A2B3C4D); 691 sechdr.majorversion = pcapng_swap16(libtrace, 1); 677 692 sechdr.minorversion = 0; 678 693 sechdr.sectionlen = 0xFFFFFFFFFFFFFFFF; … … 689 704 /* Create interface block*/ 690 705 pcapng_int_t inthdr; 691 inthdr.blocktype = pcapng_swap32( packet, PCAPNG_INTERFACE_TYPE);692 inthdr.blocklen = pcapng_swap32( packet, 20);693 inthdr.linktype = pcapng_swap16( packet, libtrace_to_pcap_dlt(linktype));706 inthdr.blocktype = pcapng_swap32(libtrace, PCAPNG_INTERFACE_TYPE); 707 inthdr.blocklen = pcapng_swap32(libtrace, 20); 708 inthdr.linktype = pcapng_swap16(libtrace, libtrace_to_pcap_dlt(linktype)); 694 709 inthdr.reserved = 0; 695 710 inthdr.snaplen = 0; … … 749 764 750 765 /* construct the packet */ 751 epkthdr.blocktype = pcapng_swap32( packet, PCAPNG_ENHANCED_PACKET_TYPE);752 epkthdr.blocklen = pcapng_swap32( packet, blocklen);753 epkthdr.interfaceid = pcapng_swap32( packet, DATAOUT(libtrace)->nextintid-1);754 epkthdr.timestamp_high = pcapng_swap32( packet, ts.timehigh);755 epkthdr.timestamp_low = pcapng_swap32( packet, ts.timelow);756 epkthdr.wlen = pcapng_swap32( packet, wirelen);757 epkthdr.caplen = pcapng_swap32( packet, caplen);766 epkthdr.blocktype = pcapng_swap32(libtrace, PCAPNG_ENHANCED_PACKET_TYPE); 767 epkthdr.blocklen = pcapng_swap32(libtrace, blocklen); 768 epkthdr.interfaceid = pcapng_swap32(libtrace, DATAOUT(libtrace)->nextintid-1); 769 epkthdr.timestamp_high = pcapng_swap32(libtrace, ts.timehigh); 770 epkthdr.timestamp_low = pcapng_swap32(libtrace, ts.timelow); 771 epkthdr.wlen = pcapng_swap32(libtrace, wirelen); 772 epkthdr.caplen = pcapng_swap32(libtrace, caplen); 758 773 759 774 /* output enhanced packet header */
Note: See TracChangeset
for help on using the changeset viewer.