Changeset 6df012d for lib/libtrace.h.in


Ignore:
Timestamp:
09/17/06 18:36:13 (15 years ago)
Author:
Scott Raynel <smr26@…>
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:
1dc7df3
Parents:
3af7b80
Message:

Fix get_payload_from_link for prism and radiotap.
Make sure to use bswap when looking at radiotap length.
Tidy up exported API, don't export get_payload_from_prism or _from_radiotap.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/libtrace.h.in

    r935c3d0 r6df012d  
    495495 * specified in the it_present bitmask. If bit 31 of it_present is set, then
    496496 * another bitmask follows.
    497  * NB: All of the radiotap data fields are in little-endian byte-order.
     497 * @note All of the radiotap data fields are in little-endian byte-order.
    498498 */
    499499typedef struct libtrace_radiotap_t {
     
    851851DLLEXPORT void *trace_get_payload_from_ip(libtrace_ip_t *ip, uint8_t *proto,
    852852                uint32_t *remaining);
    853 
    854 
    855 /** Gets a pointer to the payload given a pointer to the Radiotap header
    856  * @param link a pointer to the Radiotap header
    857  * @param[out] type     An output variable of the ethernet type
    858  * @param[in,out] remaining Updated with the number of bytes remaining
    859  *
    860  * @return a pointer to the 802.11 header, or NULL if header isn't
    861  * present.
    862  *
    863  * Remaining may be NULL.  If Remaining is not NULL it must point to the number
    864  * of bytes captured of the linklayer and beyond.  It will be updated after
    865  * this function to the number of bytes remaining after the Radiotap header has been
    866  * removed.
    867  *
    868  * type may be NULL if not needed.
    869  */
    870 DLLEXPORT void *trace_get_payload_from_radiotap(void *link,
    871                 uint16_t *type, uint32_t *remaining);
    872 
    873 
    874 /** Gets a pointer to the payload given a pointer to the Prism monitoring header
    875  * @param link a pointer to the Prism monitoring header
    876  * @param[out] type     An output variable of the ethernet type
    877  * @param[in,out] remaining Updated with the number of bytes remaining
    878  *
    879  * @return a pointer to the 802.11 header, or NULL if header isn't
    880  * present.
    881  *
    882  * Remaining may be NULL.  If Remaining is not NULL it must point to the number
    883  * of bytes captured of the linklayer and beyond.  It will be updated after
    884  * this function to the number of bytes remaining after the Radiotap header has been
    885  * removed.
    886  *
    887  * type may be NULL if not needed.
    888  */
    889 DLLEXPORT void *trace_get_payload_from_prism(void *link,
    890                 uint16_t *type, uint32_t *remaining);
    891 
    892853
    893854/** Gets a pointer to the payload given a pointer to the link header
Note: See TracChangeset for help on using the changeset viewer.