Changeset 39e141f for lib/protocols.c

Timestamp:

04/21/06 10:28:36 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

222d8f5

Parents:

d0906e7

Message:

Merge windows portability fixes

File:

• lib/protocols.c (modified) (17 diffs)

lib/protocols.c

@@ -242 +242 @@
 #define SW_IP_OFFMASK 0xff1f
 
-void *trace_get_payload_from_ip(libtrace_ip_t *ipptr, uint8_t *prot,
+DLLEXPORT void *trace_get_payload_from_ip(libtrace_ip_t *ipptr, uint8_t *prot,
                 uint32_t *remaining) 
 {
@@ -307 +307 @@
 }
 
-void *trace_get_transport(libtrace_packet_t *packet, 
+DLLEXPORT void *trace_get_transport(libtrace_packet_t *packet, 
                 uint8_t *proto,
                 uint32_t *remaining
@@ -363 +363 @@
 }
 
-libtrace_tcp_t *trace_get_tcp(libtrace_packet_t *packet) {
+DLLEXPORT libtrace_tcp_t *trace_get_tcp(libtrace_packet_t *packet) {
         uint8_t proto;
         libtrace_tcp_t *tcp;
@@ -375 +375 @@
 }
 
-libtrace_tcp_t *trace_get_tcp_from_ip(libtrace_ip_t *ip, uint32_t *remaining)
+DLLEXPORT libtrace_tcp_t *trace_get_tcp_from_ip(libtrace_ip_t *ip, uint32_t *remaining)
 {
         struct libtrace_tcp *tcpptr = 0;
@@ -387 +387 @@
 }
 
-libtrace_udp_t *trace_get_udp(libtrace_packet_t *packet) {
+DLLEXPORT libtrace_udp_t *trace_get_udp(libtrace_packet_t *packet) {
         uint8_t proto;
         libtrace_udp_t *udp;
@@ -399 +399 @@
 }
 
-libtrace_udp_t *trace_get_udp_from_ip(libtrace_ip_t *ip, uint32_t *remaining)
+DLLEXPORT libtrace_udp_t *trace_get_udp_from_ip(libtrace_ip_t *ip, uint32_t *remaining)
 {
         struct libtrace_udp *udpptr = 0;
@@ -411 +411 @@
 }
 
-libtrace_icmp_t *trace_get_icmp(libtrace_packet_t *packet) {
+DLLEXPORT libtrace_icmp_t *trace_get_icmp(libtrace_packet_t *packet) {
         uint8_t proto;
         libtrace_icmp_t *icmp;
@@ -423 +423 @@
 }
 
-libtrace_icmp_t *trace_get_icmp_from_ip(libtrace_ip_t *ip, uint32_t *remaining)
+DLLEXPORT libtrace_icmp_t *trace_get_icmp_from_ip(libtrace_ip_t *ip, uint32_t *remaining)
 {
         libtrace_icmp_t *icmpptr = 0;
@@ -435 +435 @@
 }
 
-void *trace_get_payload_from_udp(libtrace_udp_t *udp, uint32_t *remaining)
+DLLEXPORT void *trace_get_payload_from_udp(libtrace_udp_t *udp, uint32_t *remaining)
 {
         if (remaining) {
@@ -445 +445 @@
 }
 
-void *trace_get_payload_from_tcp(libtrace_tcp_t *tcp, uint32_t *remaining)
+DLLEXPORT void *trace_get_payload_from_tcp(libtrace_tcp_t *tcp, uint32_t *remaining)
 {
         unsigned int dlen = tcp->doff*4;
@@ -456 +456 @@
 }
 
-void *trace_get_payload_from_icmp(libtrace_icmp_t *icmp, uint32_t *remaining)
+DLLEXPORT void *trace_get_payload_from_icmp(libtrace_icmp_t *icmp, uint32_t *remaining)
 {
         if (remaining) {
@@ -473 +473 @@
 /* Return the client port
  */
-uint16_t trace_get_source_port(const libtrace_packet_t *packet)
+DLLEXPORT uint16_t trace_get_source_port(const libtrace_packet_t *packet)
 {
         struct ports_t *port = 
@@ -486 +486 @@
 
 /* Same as get_source_port except use the destination port */
-uint16_t trace_get_destination_port(const libtrace_packet_t *packet)
+DLLEXPORT uint16_t trace_get_destination_port(const libtrace_packet_t *packet)
 {
         struct ports_t *port = 
@@ -530 +530 @@
 }
 
-uint8_t *trace_get_destination_mac(libtrace_packet_t *packet) {
+DLLEXPORT uint8_t *trace_get_destination_mac(libtrace_packet_t *packet) {
         void *link = trace_get_link(packet);
         libtrace_80211_t *wifi;
@@ -562 +562 @@
 }
 
-struct sockaddr *trace_get_source_address(const libtrace_packet_t *packet, 
+DLLEXPORT struct sockaddr *trace_get_source_address(const libtrace_packet_t *packet, 
                 struct sockaddr *addr)
 {
@@ -616 +616 @@
 }
 
-struct sockaddr *trace_get_destination_address(const libtrace_packet_t *packet, 
+DLLEXPORT struct sockaddr *trace_get_destination_address(const libtrace_packet_t *packet, 
                 struct sockaddr *addr)
 {
@@ -688 +688 @@
  * @author Perry Lorier
  */
-int trace_get_next_option(unsigned char **ptr,int *len,
+DLLEXPORT int trace_get_next_option(unsigned char **ptr,int *len,
                         unsigned char *type,
                         unsigned char *optlen,