Changeset 17dc71c

Timestamp:

11/28/12 15:49:05 (8 years ago)

Author:

Richard Sanger <rjs51@…>

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:

1935565

Parents:

d500159

Message:

Fix silly mistake that was breaking get_link_type and get_link_direction. Changed data sizes in these functions to match those in the sockaddr_ll header

File:

• lib/format_linux.c (modified) (3 diffs)

lib/format_linux.c

@@ -1094 +1094 @@
 }
 
-static inline libtrace_linktype_t get_libtrace_link_type(int linktype){
+static inline libtrace_linktype_t get_libtrace_link_type(uint16_t linktype){
         /* Convert the ARPHRD type into an appropriate libtrace link type */
         switch (linktype) {
@@ -1115 +1115 @@
 }
 static libtrace_linktype_t linuxnative_get_link_type(const struct libtrace_packet_t *packet) {
-        int linktype=(((struct libtrace_linuxnative_header*)(packet->buffer))
+        uint16_t linktype=(((struct libtrace_linuxnative_header*)(packet->buffer))
                                 ->hdr.sll_hatype);
         return get_libtrace_link_type(linktype);
 }
 static libtrace_linktype_t linuxring_get_link_type(const struct libtrace_packet_t *packet) {
-        int linktype= GET_SOCKADDR_HDR(packet->buffer)->sll_hatype;
+        uint16_t linktype= GET_SOCKADDR_HDR(packet->buffer)->sll_hatype;
         return get_libtrace_link_type(linktype);
 }
 
-static inline libtrace_direction_t get_libtrace_direction(int pkttype){
+static inline libtrace_direction_t get_libtrace_direction(uint8_t pkttype){
         switch (pkttype) {
                 case PACKET_OUTGOING:
@@ -1134 +1134 @@
 }
 static libtrace_direction_t linuxnative_get_direction(const struct libtrace_packet_t *packet) {
-        return get_libtrace_link_type(((struct libtrace_linuxnative_header*)(packet->buffer))->hdr.sll_pkttype);
+        return get_libtrace_direction(((struct libtrace_linuxnative_header*)(packet->buffer))->hdr.sll_pkttype);
 }
 static libtrace_direction_t linuxring_get_direction(const struct libtrace_packet_t *packet) {
-        return get_libtrace_link_type(GET_SOCKADDR_HDR(packet->buffer)->sll_pkttype);
+        return get_libtrace_direction(GET_SOCKADDR_HDR(packet->buffer)->sll_pkttype);
 }