Changeset 1556 for trunk/lib/format_pcapfile.c

Timestamp:

04/14/10 15:26:28 (3 years ago)

Author:

perry

Message:

Split compression type out from fileflags

File:

• trunk/lib/format_pcapfile.c (modified) (4 diffs)

trunk/lib/format_pcapfile.c

@@ -88 +88 @@
 struct pcapfile_format_data_out_t {
         iow_t *file;
+        int compress_type;
         int level;
         int flag;
@@ -128 +129 @@
 
         DATAOUT(libtrace)->file=NULL;
+        DATAOUT(libtrace)->compress_type=TRACE_OPTION_COMPRESSTYPE_NONE;
         DATAOUT(libtrace)->level=0;
         DATAOUT(libtrace)->flag=O_CREAT|O_WRONLY;
@@ -266 +268 @@
                         DATAOUT(libtrace)->level = *(int*)value;
                         return 0;
+                case TRACE_OPTION_OUTPUT_COMPRESSTYPE:
+                        DATAOUT(libtrace)->compress_type = *(int*)value;
+                        return 0;
                 case TRACE_OPTION_OUTPUT_FILEFLAGS:
                         DATAOUT(libtrace)->flag = *(int*)value;
@@ -412 +417 @@
 
                 DATAOUT(out)->file=trace_open_file_out(out,
+                                DATAOUT(out)->compress_type,
                                 DATAOUT(out)->level,
                                 DATAOUT(out)->flag);