Changeset 566e404
- Timestamp:
- 04/14/06 17:36:52 (15 years ago)
- Branches:
- 4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
- Children:
- 671566a
- Parents:
- 97e39a7
- Location:
- lib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_linux.c
r97e39a7 r566e404 68 68 if (FORMAT(libtrace->format_data)->fd==-1) { 69 69 free(libtrace->format_data); 70 return 0;70 return -1; 71 71 } 72 72 addr.sll_family = AF_PACKET; … … 77 77 close(FORMAT(libtrace->format_data)->fd); 78 78 free(libtrace->format_data); 79 return 0;79 return -1; 80 80 } 81 81 } … … 87 87 sizeof(addr))==-1) { 88 88 free(libtrace->format_data); 89 return 0;89 return -1; 90 90 } 91 91 /* enable promisc mode when listening on an interface */ … … 102 102 } 103 103 104 return 1;104 return 0; 105 105 } 106 106 … … 112 112 113 113 static int linuxnative_read_packet(struct libtrace_t *libtrace, struct libtrace_packet_t *packet) { 114 struct libtrace_linuxnative_header *hdr=(void*)packet->buffer; 114 struct libtrace_linuxnative_header *hdr; 115 if (!packet->buffer || packet->buf_control == TRACE_CTRL_EXTERNAL) { 116 packet->buffer = malloc(LIBTRACE_PACKET_BUFSIZE); 117 packet->buf_control = TRACE_CTRL_PACKET; 118 } 119 120 packet->header = packet->buffer; 121 packet->type = RT_DATA_LINUX_NATIVE; 122 packet->payload = packet->buffer+sizeof(*hdr); 123 124 hdr=(void*)packet->buffer; 115 125 socklen_t socklen=sizeof(hdr->hdr); 116 126 hdr->wirelen = recvfrom(FORMAT(libtrace->format_data)->fd, 117 (void*)packet-> buffer+sizeof(*hdr),118 sizeof(packet->buffer)-sizeof(*hdr),127 (void*)packet->payload, 128 LIBTRACE_PACKET_BUFSIZE-sizeof(*hdr), 119 129 MSG_TRUNC, 120 130 (void *)&hdr->hdr, -
lib/rt_protocol.h
r4617920 r566e404 60 60 RT_DATA_LEGACY_POS =RT_DATA_SIMPLE + TRACE_FORMAT_LEGACY_POS, 61 61 RT_DATA_LEGACY_ETH =RT_DATA_SIMPLE + TRACE_FORMAT_LEGACY_ETH, 62 RT_DATA_LINUX_NATIVE =RT_DATA_SIMPLE + TRACE_FORMAT_LINUX_NATIVE, 62 63 63 64 #ifdef HAVE_PCAP
Note: See TracChangeset
for help on using the changeset viewer.