Changeset c3e5f30

Timestamp:

04/26/06 16:06:08 (15 years ago)

Author:

Shane Alcock <salcock@…>

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:

ae66bde

Parents:

b333d68

Message:

Fixed the Makefile to include libtraceio.h when doing a 'make dist'
Multiple rt clients no longer share the same reliability variable

Location:

lib

Files:

• Makefile.am (modified) (2 diffs)
• format_rt.c (modified) (3 diffs)

lib/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libtrace.la
-include_HEADERS = libtrace.h dagformat.h wag.h lt_inttypes.h daglegacy.h rt_protocol.h
+include_HEADERS = libtrace.h dagformat.h wag.h lt_inttypes.h daglegacy.h rt_protocol.h libtraceio.h
 
 extra_DIST = format_template.c
@@ -7 +7 @@
                 format_rt.c format_helper.c format_helper.h format_pcapfile.c \
                 parse_cmd.c parse_cmd.h libtrace_int.h lt_inttypes.h \
-                linktypes.c protocols.c 
+                linktypes.c protocols.c libtraceio.h 
 if HAVE_NETPACKET_PACKET_H
 libtrace_la_SOURCES+=format_linux.c

lib/format_rt.c

@@ -53 +53 @@
 
 #define RT_INFO ((struct rt_format_data_t*)libtrace->format_data)
-
-int reliability = 0;
 
 char *rt_deny_reason(uint8_t reason) {
@@ -174 +172 @@
                                 return -1;
                         }
-                        reliability = hello_opts.reliable;
+                        RT_INFO->reliable = hello_opts.reliable;
                         
                         return 0;
@@ -489 +487 @@
                 rt_set_payload(packet);
 
-                if (reliability > 0) {
-                        
+                if (RT_INFO->reliable > 0) {
                         if (rt_send_ack(libtrace, pkt_hdr->sequence) 
                                         == -1)