Changeset ef55d05

Timestamp:

08/04/05 16:16:12 (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:

77bd94f

Parents:

9e2a109

Message:

Added more help info - fixed major rtserver bug - added a little more documentation

Location:

lib

Files:

• format_erf.c (modified) (7 diffs)
• rtserver.c (modified) (3 diffs)
• trace.c (modified) (1 diff)

lib/format_erf.c

@@ -314 +314 @@
         // extract conn_info from uridata
         if (strlen(uridata) == 0) {
-                libtrace->format_data->conn_info.rt.hostname = 
-                        strdup("localhost");
-                libtrace->format_data->conn_info.rt.port = COLLECTOR_PORT;
+                libtrace->conn_info.rt.hostname = NULL;
+                libtrace->conn_info.rt.port = COLLECTOR_PORT;
         }
         else {
                 if ((scan = strchr(uridata,':')) == NULL) {
-                        libtrace->format_data->conn_info.rt.hostname =
-                                strdup(uridata);
-                        libtrace->format_data->conn_info.rt.port =
-                                COLLECTOR_PORT;
+                        libtrace->conn_info.rt.hostname =
+                                NULL;
+                        libtrace->conn_info.rt.port =
+                                atoi(uridata);
                 } else {
                         libtrace->format_data->conn_info.rt.hostname =
@@ -647 +646 @@
                 fifo_out_update(libtrace->fifo, size);
                 fifo_ack_update(libtrace->fifo, size);
+                return numbytes;
         } while(1);
 }
@@ -706 +706 @@
 }
 
-static size_t erf_set_capture_length(struct libtrace_packet_t *packet, const size_t size) {
+static size_t erf_set_capture_length(struct libtrace_packet_t *packet, size_t size) {
         dag_record_t *erfptr = 0;
         assert(packet);
@@ -737 +737 @@
         printf("\terf:/path/to/file\t(uncompressed)\n");
         printf("\terf:/path/to/file.gz\t(gzip-compressed)\n");
-        printf("\terf:-\t(stdin, either compressed or not)\n")/
+        printf("\terf:-\t(stdin, either compressed or not)\n");
         printf("\terf:/path/to/socket\n");
         printf("\n");
@@ -743 +743 @@
         printf("\n");
         printf("Supported output URIs:\n");
-        printf("\tnone\n");
-        printf("\n");
-
+        printf("\terf:path/to/file\t(uncompressed)\n");
+        printf("\terf:/path/to/file.gz\t(gzip-compressed)\n");
+        printf("\terf:-\t(stdout, either compressed or not)\n");
+        printf("\n");
+        printf("\te.g.: erf:/tmp/trace\n");
+        printf("\n");
+        printf("Supported output options:\n");
+        printf("\t-z\tSpecify the gzip compression, ranging from 0 (uncompressed) to 9 - defaults to 1\n");
+        printf("\n");
+
+        
 }
 
@@ -752 +760 @@
         printf("Supported input URIs:\n");
         printf("\trtclient:hostname:port\n");
-        printf("\trtclient:port\n");
+        printf("\trtclient:hostname (connects on default port)\n");
         printf("\n");
         printf("\te.g.: rtclient:localhost\n");
@@ -758 +766 @@
         printf("\n");
         printf("Supported output URIs:\n");
+        printf("\trtclient: \t(will output on default port on all available IP addresses) \n");
+        printf("\trtclient:hostname:port\n");
         printf("\trtclient:port\n");
         printf("\n");
         printf("\te.g.: rtclient:32500\n");
+        printf("\te.g.: rtclient:\n");
         printf("\n");
 

lib/rtserver.c

@@ -28 +28 @@
         FD_ZERO(&rtserver->rt_fds);
 
-        if ((he=gethostbyname(hostname)) == NULL) {
-                perror("gethostbyname");
-                return 0;
-        }
+        if (hostname) {
+                if ((he=gethostbyname(hostname)) == NULL) {
+                        perror("gethostbyname");
+                        return 0;
+                }
+        }
+        
         if ((rtserver->connect_fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
                 perror("socket");
@@ -44 +47 @@
         bzero((char *) rtserver->remote, sizeof(rtserver->remote));
         rtserver->remote->sin_family = AF_INET;
-        rtserver->remote->sin_addr.s_addr = INADDR_ANY;
+        if (hostname)
+                rtserver->remote->sin_addr = *((struct in_addr *)he->h_addr);
+        else 
+                rtserver->remote->sin_addr.s_addr = INADDR_ANY;
         rtserver->remote->sin_port = htons(port);
 
@@ -56 +62 @@
                 return 0;
         }
-
+        
         rtserver->max_rtfds = rtserver->connect_fd;
 

lib/trace.c

@@ -367 +367 @@
 }
 
+/** Parses an output options string and calls the appropriate function to deal with output options.
+ *
+ * @param libtrace      the output trace object to apply the options to
+ * @param options       the options string
+ * @returns -1 if option configuration failed, 0 otherwise
+ *
+ * @author Shane Alcock
+ */
 int trace_output_config(struct libtrace_out_t *libtrace, char *options) {
         char *opt_string = 0;