Merge branch 'master' into pcap-options

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75fc26e580c12e158273af51f50dbecb94baf261..b6474b16bf214c96512105c4e33cf753823687cf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1061,6 +1061,7 @@ set(PROJECT_SOURCE_LIST_C
     nametoaddr.c
     optimize.c
     pcap-common.c
+    pcap-options.c
     pcap.c
     savefile.c
     sf-pcapng.c

diff --git a/Makefile.in b/Makefile.in
index a0e4b9fadf81329ee6a5bf6fc0c4b4f5655f29f5..70605ddf82ad285b087d4ebd6e03dde69cf61ef4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,7 +94,7 @@ MODULE_C_SRC =                @MODULE_C_SRC@
 REMOTE_C_SRC =         @REMOTE_C_SRC@
 COMMON_C_SRC = pcap.c gencode.c optimize.c nametoaddr.c etherent.c \
                fmtutils.c \
-               savefile.c sf-pcap.c sf-pcapng.c pcap-common.c \
+               savefile.c sf-pcap.c sf-pcapng.c pcap-common.c pcap-options.c \
                bpf_image.c bpf_filter.c bpf_dump.c
 GENERATED_C_SRC = scanner.c grammar.c
 LIBOBJS = @LIBOBJS@

diff --git a/pcap-options.c b/pcap-options.c
new file mode 100644 (file)
index 0000000..52ce849
--- /dev/null
+++ b/pcap-options.c
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 1993, 1994, 1995, 1996, 1998
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+ * the University nor the names of its contributors may be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/types.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "pcap-int.h"
+
+/*
+ * Private data for storing sets of options.
+ * This is to be used by functions which seem to grow additional options
+ * This is avoid ABI explosition of do_thing, and do_thing_with_opt_bar(),
+ * and then do_thing_with_opt_bar_baz(...). Instead a "pcap_option" should be
+ * created to which get/set shall be done.
+ *
+ * each option shall have an element in enum pcap_option_name {}.
+ */
+struct pcap_options {
+        int   tstamp_precision;
+        const char *io_read_plugin;
+        const char *io_write_plugin;
+};
+
+pcap_options *pcap_alloc_option(void)
+{
+        pcap_options *po = malloc(sizeof(struct pcap_options));
+        memset(po, 0, sizeof(struct pcap_options));
+        return po;  // caller has to check for NULL anyway.
+}
+
+void pcap_free_option(pcap_options *po)
+{
+        if(po != NULL) {
+                if(po->io_read_plugin) free((void *)po->io_read_plugin);
+                if(po->io_write_plugin) free((void *)po->io_write_plugin);
+                free((void *)po);
+        }
+}
+
+/* Return 0 on success, -1 on failure invalid option, -2 on type mis-match */
+int pcap_set_option_string(pcap_options *po,
+                           enum   pcap_option_name pon,
+                           const char *value)
+{
+        const char *saved = strdup(value);
+        switch(pon) {
+        case PON_TSTAMP_PRECISION:
+                free((void *)saved);
+                return -2;
+
+        case PON_IO_READ_PLUGIN:
+                po->io_read_plugin = saved;
+                break;
+        case PON_IO_WRITE_PLUGIN:
+                po->io_write_plugin= saved;
+                break;
+        default:
+                free((void *)saved);
+                return -1;
+        }
+        return 0;
+}
+
+/* Return 0 on success, -1 on failure invalid option, -2 on type mis-match */
+int pcap_set_option_int(pcap_options *po,
+                        enum   pcap_option_name pon,
+                        const int value)
+{
+        switch(pon) {
+        case PON_TSTAMP_PRECISION:
+                po->tstamp_precision = value;
+                break;
+
+        case PON_IO_READ_PLUGIN:
+        case PON_IO_WRITE_PLUGIN:
+                return -2;
+        default:
+                return -1;
+        }
+        return 0;
+}
+
+const char *pcap_get_option_string(pcap_options *po,
+                                   enum   pcap_option_name pon)
+{
+        switch(pon) {
+        case PON_TSTAMP_PRECISION:
+                return NULL;
+
+        case PON_IO_READ_PLUGIN:
+                return po->io_read_plugin;
+        case PON_IO_WRITE_PLUGIN:
+                return po->io_write_plugin;
+        }
+        return NULL;
+}
+
+
+/* return int value, or zero for not-found, mis-type */
+int pcap_get_option_int(pcap_options *po,
+                        enum   pcap_option_name pon)
+{
+        switch(pon) {
+        case PON_TSTAMP_PRECISION:
+                return po->tstamp_precision;
+                break;
+
+        case PON_IO_READ_PLUGIN:
+        case PON_IO_WRITE_PLUGIN:
+                return 0;
+        }
+        return 0;
+}
+

diff --git a/pcap/pcap.h b/pcap/pcap.h
index a4e20f6012f793ea3ba5a29d91c069acd14fb60e..13ebfdbded186dc9d802825bc19f68f94cbf26cd 100644 (file)
--- a/pcap/pcap.h
+++ b/pcap/pcap.h
@@ -1265,6 +1265,23 @@ PCAP_API int     pcap_remoteact_close(const char *host, char *errbuf);
 PCAP_AVAILABLE_1_9
 PCAP_API void  pcap_remoteact_cleanup(void);
 
+enum pcap_option_name {  /* never renumber this */
+                      PON_TSTAMP_PRECISION = 1,  /* int */
+                      PON_IO_READ_PLUGIN   = 2,  /* char * */
+                      PON_IO_WRITE_PLUGIN  = 3,  /* char * */
+};
+typedef struct pcap_options pcap_options;
+PCAP_API pcap_options *pcap_alloc_option(void);
+PCAP_API void pcap_free_option(pcap_options *po);
+PCAP_API int pcap_set_option_string(pcap_options *po,
+                                   enum pcap_option_name pon, const char *value);
+PCAP_API int pcap_set_option_int(pcap_options *po,
+                                enum pcap_option_name pon, const int value);
+PCAP_API const char *pcap_get_option_string(pcap_options *po, enum pcap_option_name pon);
+PCAP_API int pcap_get_option_int(pcap_options *po, enum pcap_option_name pon);
+
+
+
 #ifdef __cplusplus
 }
 #endif