Changeset 7fc01569
- Timestamp:
- 04/25/06 20:19:56 (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:
- b874684
- Parents:
- bf66333
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/libtrace.h
rbf66333 r7fc01569 210 210 { 211 211 #if BYTE_ORDER == LITTLE_ENDIAN 212 u nsigned int ip_hl:4; /**< header length */213 u nsigned int ip_v:4; /**< version */212 uint8_t ip_hl:4; /**< header length */ 213 uint8_t ip_v:4; /**< version */ 214 214 #elif BYTE_ORDER == BIG_ENDIAN 215 u nsigned int ip_v:4; /**< version */216 u nsigned int ip_hl:4; /**< header length */215 uint8_t ip_v:4; /**< version */ 216 uint8_t ip_hl:4; /**< header length */ 217 217 #else 218 218 # error "Adjust your <bits/endian.h> defines" … … 222 222 int16_t ip_id; /**< identification */ 223 223 #if BYTE_ORDER == LITTLE_ENDIAN 224 u nsigned int ip_off:12; /**< fragment offset */225 u nsigned int ip_mf:1; /**< more fragments flag */226 u nsigned int ip_df:1; /**< dont fragment flag */227 u nsigned int ip_rf:1; /**< reserved fragment flag */224 uint16_t ip_off:12; /**< fragment offset */ 225 uint16_t ip_mf:1; /**< more fragments flag */ 226 uint16_t ip_df:1; /**< dont fragment flag */ 227 uint16_t ip_rf:1; /**< reserved fragment flag */ 228 228 #elif BYTE_ORDER == BIG_ENDIAN 229 u nsigned int ip_rf:1;230 u nsigned int ip_df:1;231 u nsigned int ip_mf:1;232 u nsigned int ip_off:12;229 uint16_t ip_rf:1; 230 uint16_t ip_df:1; 231 uint16_t ip_mf:1; 232 uint16_t ip_off:12; 233 233 #else 234 234 # error "Adjust your <bits/endian.h> defines" … … 266 266 uint32_t ack_seq; /**< Acknowledgement Number */ 267 267 # if BYTE_ORDER == LITTLE_ENDIAN 268 u nsigned int res1:4; /**< Reserved bits */269 u nsigned int doff:4; /**< data offset */270 u nsigned int fin:1; /**< FIN */271 u nsigned int syn:1; /**< SYN flag */272 u nsigned int rst:1; /**< RST flag */273 u nsigned int psh:1; /**< PuSH flag */274 u nsigned int ack:1; /**< ACK flag */275 u nsigned int urg:1; /**< URG flag */276 u nsigned int res2:2; /**< Reserved */268 uint8_t res1:4; /**< Reserved bits */ 269 uint8_t doff:4; /**< data offset */ 270 uint8_t fin:1; /**< FIN */ 271 uint8_t syn:1; /**< SYN flag */ 272 uint8_t rst:1; /**< RST flag */ 273 uint8_t psh:1; /**< PuSH flag */ 274 uint8_t ack:1; /**< ACK flag */ 275 uint8_t urg:1; /**< URG flag */ 276 uint8_t res2:2; /**< Reserved */ 277 277 # elif BYTE_ORDER == BIG_ENDIAN 278 u nsigned int doff:4; /**< Data offset */279 u nsigned int res1:4; /**< Reserved bits */280 u nsigned int res2:2; /**< Reserved */281 u nsigned int urg:1; /**< URG flag */282 u nsigned int ack:1; /**< ACK flag */283 u nsigned int psh:1; /**< PuSH flag */284 u nsigned int rst:1; /**< RST flag */285 u nsigned int syn:1; /**< SYN flag */286 u nsigned int fin:1; /**< FIN flag */278 uint8_t doff:4; /**< Data offset */ 279 uint8_t res1:4; /**< Reserved bits */ 280 uint8_t res2:2; /**< Reserved */ 281 uint8_t urg:1; /**< URG flag */ 282 uint8_t ack:1; /**< ACK flag */ 283 uint8_t psh:1; /**< PuSH flag */ 284 uint8_t rst:1; /**< RST flag */ 285 uint8_t syn:1; /**< SYN flag */ 286 uint8_t fin:1; /**< FIN flag */ 287 287 # else 288 288 # error "Adjust your <bits/endian.h> defines" … … 346 346 typedef struct libtrace_8021q 347 347 { 348 u nsigned int vlan_pri:3; /**< vlan user priority */349 u nsigned int vlan_cfi:1; /**< vlan format indicator,348 uint16_t vlan_pri:3; /**< vlan user priority */ 349 uint16_t vlan_cfi:1; /**< vlan format indicator, 350 350 * 0 for ethernet, 1 for token ring */ 351 u nsigned int vlan_id:12; /**< vlan id */351 uint16_t vlan_id:12; /**< vlan id */ 352 352 uint16_t vlan_ether_type; /**< vlan sub-packet type ID field 353 353 * (next-header)*/ … … 357 357 typedef struct libtrace_atm_cell 358 358 { 359 u nsigned int gfc:4; /**< Generic Flow Control */360 uint 8_t vpi;/**< Virtual Path Identifier */361 uint 16_t vci;/**< Virtual Channel Identifier */362 u nsigned int pt:3; /**< Payload Type */363 u nsigned int clp:1; /**< Cell Loss Priority */364 uint 8_t hec;/**< Header Error Control */359 uint32_t gfc:4; /**< Generic Flow Control */ 360 uint32_t vpi:8; /**< Virtual Path Identifier */ 361 uint32_t vci:8; /**< Virtual Channel Identifier */ 362 uint32_t pt:3; /**< Payload Type */ 363 uint32_t clp:1; /**< Cell Loss Priority */ 364 uint32_t hec:8; /**< Header Error Control */ 365 365 } PACKED libtrace_atm_cell_t; 366 366 … … 374 374 /** 802.11 header */ 375 375 typedef struct libtrace_80211_t { 376 u nsigned int protocol:2;377 u nsigned int type:2;378 u nsigned int subtype:4;379 u nsigned int to_ds:1; /**< Packet to Distribution Service */380 u nsigned int from_ds:1;/**< Packet from Distribution Service */381 u nsigned int more_frag:1;/**< Packet has more fragments */382 u nsigned int retry:1; /**< Packet is a retry */383 u nsigned int power:1;384 u nsigned int more_data:1;385 u nsigned int wep:1;386 u nsigned int order:1;387 u nsigned int duration;376 uint16_t protocol:2; 377 uint16_t type:2; 378 uint16_t subtype:4; 379 uint16_t to_ds:1; /**< Packet to Distribution Service */ 380 uint16_t from_ds:1; /**< Packet from Distribution Service */ 381 uint16_t more_frag:1; /**< Packet has more fragments */ 382 uint16_t retry:1; /**< Packet is a retry */ 383 uint16_t power:1; 384 uint16_t more_data:1; 385 uint16_t wep:1; 386 uint16_t order:1; 387 uint16_t duration; 388 388 uint8_t mac1[6]; 389 389 uint8_t mac2[6];
Note: See TracChangeset
for help on using the changeset viewer.