Changeset a9d9fd6

Timestamp:

06/28/04 12:55:10 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

139a80d

Parents:

c681e86

Message:

poink

Location:

lib

Files:

• Makefile (modified) (1 diff)
• trace.c (modified) (2 diffs)

lib/Makefile

@@ -10 +10 @@
 
 CURRENT=1
-REVISION=3
+REVISION=4
 AGE=0
 

lib/trace.c

@@ -202 +202 @@
  *  - erf:/path/to/rtclient/socket
  *  - erf:-  (stdin)
- *  - dag:/dev/dagcard                  (implementd?)
+ *  - dag:/dev/dagcard                  (not implementd)
  *  - pcap:pcapinterface                (eg: pcap:eth0)
  *  - pcap:/path/to/pcap/file
  *  - pcap:/path/to/pcap/file.gz
- *  - pcap:/path/to/pcap/socket         (implemented?)
+ *  - pcap:/path/to/pcap/socket         (not implemented)
  *  - pcap:-
  *  - rtclient:hostname
@@ -338 +338 @@
                 buffer = malloc(len);
 
-        /* TODO: Make me a switch */
-        if(libtrace->sourcetype == SOCKET || libtrace->sourcetype == RT) {
-                // read from the network
-                if ((numbytes=recv(libtrace->input.fd, buffer, len, 0)) == -1) {
-                        perror("recv");
-                        return -1;
-                }
-        } else if (libtrace->sourcetype == DEVICE) {
-                if ((numbytes=read(libtrace->input.fd, buffer, len)) == -1) {
-                        perror("read");
-                        return -1;
-                }
-        } else {
-                if ((numbytes=gzread(libtrace->input.file,buffer,len)) == -1) {
-                        perror("gzread");
-                        return -1;
-                }
-        }
+        switch(libtrace->sourcetype) {
+                case SOCKET:
+                case RT:
+                        // read from the network
+                        if ((numbytes=recv(libtrace->input.fd, 
+                                                        buffer, 
+                                                        len, 
+                                                        0)) == -1) {
+                                perror("recv");
+                                return -1;
+                        }
+                        break;
+                case DEVICE:
+                        if ((numbytes=read(libtrace->input.fd, 
+                                                        buffer, 
+                                                        len)) == -1) {
+                                perror("read");
+                                return -1;
+                        }
+                        break;
+                default:
+                        if ((numbytes=gzread(libtrace->input.file,
+                                                        buffer,
+                                                        len)) == -1) {
+                                perror("gzread");
+                                return -1;
+                        }
+        }
         return numbytes;