Changeset 2415

Timestamp:

03/12/10 21:43:50 (5 months ago)

Author:

aturner

Message:

port --preload-pcap option parsing to new API methodology. refs #410

Location:

trunk/src

Files:

• tcpreplay_api.c (modified) (2 diffs)
• tcpreplay_api.h (modified) (2 diffs)

trunk/src/tcpreplay_api.c

@@ -207 +207 @@
     }
 
+    /*
+     * If we're preloading the pcap before the first run, then
+     * we're forcing the file cache to be true
+     */
+
+    if (HAVE_OPT(PRELOAD_PCAP)) {
+        options->preload_pcap = true;
+        options->enable_file_cache = true;
+    }
+
     if (HAVE_OPT(TIMER)) {
         if (strcmp(OPT_ARG(TIMER), "select") == 0) {
@@ -533 +543 @@
     assert(ctx);
     ctx->options->enable_file_cache = value;
+    return 0;
+}
+
+
+/**
+ * \brief Enable or disable preloading the file cache 
+ *
+ * Note: This is a global option and forces all pcaps
+ * to be preloaded for this context.  If you turn this
+ * on, then it forces set_file_cache(true)
+ */
+int
+tcpreplay_set_preload_pcap(tcpreplay_t *ctx, bool value)
+{
+    assert(ctx);
+    ctx->options->preload_pcap = value;
+    if (value)
+        tcpreplay_set_file_cache(ctx, true);
     return 0;
 }

trunk/src/tcpreplay_api.h

@@ -146 +146 @@
     bool enable_file_cache;
     file_cache_t file_cache[MAX_FILES];
-    int preload_pcap;
+    bool preload_pcap;
 
     /* pcap files/sources to replay */
@@ -231 +231 @@
 int tcpreplay_set_tcpprep_cache(tcpreplay_t *, char *);
 int tcpreplay_add_pcapfile(tcpreplay_t *, char *);
+int tcpreplay_set_preload_pcap(tcpreplay_t *, bool);
 
 /* information */