another two steps towards privilege seperation:

move another two capture related fields (iface and cfilter) from cfile to capture_opts

also move the handling of capture related command line options from main.c to capture.c, that way a future privilege seperated capture program can use the same code to parse it's command line than Ethereal. 
It might be even possible to share this parser code even with Tethereal, didn't took a closer look at this.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13320 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 12 insertions, 1 deletions

diff --git a/summary.h b/summary.h
index 7be3230775..c16780e021 100644
--- a/summary.h
+++ b/summary.h
@@ -25,6 +25,10 @@
 #ifndef __SUMMARY_H__
 #define __SUMMARY_H__
 
+#ifdef HAVE_LIBPCAP
+#include "capture.h"
+#endif
+
 typedef struct _summary_tally {
     guint32	bytes;		/* total bytes */
     double	start_time;	/* seconds, with msec resolution */
@@ -48,9 +52,16 @@ typedef struct _summary_tally {
     const char	*iface;		/* interface name */
     const char	*dfilter;	/* display filter */
     const char	*cfilter;	/* capture filter */
+    const char	*iface_descr;/* descriptive interface name */
 } summary_tally;
 
-void summary_fill_in(capture_file *cf, summary_tally *st);
+extern void 
+summary_fill_in(capture_file *cf, summary_tally *st);
+
+#ifdef HAVE_LIBPCAP
+extern void
+summary_fill_in_capture(capture_options *capture_opts, summary_tally *st);
+#endif
 
 #endif /* summary.h */