Changeset 3d4d52d for lib/format_legacy.c

Timestamp:

02/17/06 14:49:14 (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:

65a5900

Parents:

f03fc17

Message:

Abstract away opening up traces into a single trace_open_trace that's more
simple and reliable.

File:

• lib/format_legacy.c (modified) (1 diff)

lib/format_legacy.c

@@ -127 +127 @@
 }
 
-static int erf_init_input(struct libtrace_t *libtrace) {
-        struct stat buf;
-        struct sockaddr_un unix_sock;
+static int erf_init_input(struct libtrace_t *libtrace) 
+{
         libtrace->format_data = (struct libtrace_format_data_t *)
                 malloc(sizeof(struct libtrace_format_data_t));
 
-        CONNINFO.path = libtrace->uridata;
-        if (!strncmp(CONNINFO.path,"-",1)) {
-                /* STDIN */
-                INPUT.file = LIBTRACE_FDOPEN(fileno(stdin), "r");
-        } else {
-                if (stat(CONNINFO.path,&buf) == -1 ) {
-                        trace_set_err(errno,"stat(%s)",CONNINFO.path);
-                        return 0;
-                }
-                if (S_ISSOCK(buf.st_mode)) {
-                        if ((INPUT.fd = socket(
-                                        AF_UNIX, SOCK_STREAM, 0)) == -1) {
-                                trace_set_err("socket(%s)",CONNINFO.path);
-                                return 0;
-                        }
-                        unix_sock.sun_family = AF_UNIX;
-                        bzero(unix_sock.sun_path,108);
-                        snprintf(unix_sock.sun_path,
-                                        108,"%s"
-                                        ,CONNINFO.path);
-
-                        if (connect(INPUT.fd, 
-                                        (struct sockaddr *)&unix_sock,
-                                        sizeof(struct sockaddr)) == -1) {
-                                trace_set_err("socket(%s)",CONNINFO.path);
-                                return 0;
-                        }
-                } else { 
-                        int fd;
-
-                        /* we use an FDOPEN call to reopen an FD
-                        // returned from open(), so that we can set
-                        // O_LARGEFILE. This gets around gzopen not
-                        // letting you do this...
-                        */
-                        fd=open( CONNINFO.path, O_LARGEFILE);
-                        if (fd==-1) {
-                                trace_set_err(errno,"open(%s)",CONNINFO.path);
-                                return 0;
-                        }
-                        INPUT.file = LIBTRACE_FDOPEN(fd,"r");
-                }
-        }
-        return 1;
+        libtrace->format_data->input.file = trace_open_file(libtrace);
+
+        if (libtrace->format_data->input.file)
+                return 1;
+
+        return 0;
+
 }