merge_all_tap_menus() has been moved to menus.c.

[obnox/wireshark/wip.git] / gtk / mcast_stream.h

diff --git a/gtk/mcast_stream.h b/gtk/mcast_stream.h
index f28b1cab872c278eb18aa0c2dcd7d5187ccb8ac1..0cf3d101a7eaaa9a9eca7ba26879d9a7c78b341d 100644 (file)
--- a/gtk/mcast_stream.h
+++ b/gtk/mcast_stream.h
@@ -29,46 +29,26 @@
  * Foundation,  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef Mcast_STREAM_H_INCLUDED
-#define Mcast_STREAM_H_INCLUDED
-
-#include <glib.h>
-#include <stdio.h>
-#include <epan/address.h>
-
-/** @file
- *  ??? 
- *  @ingroup dialog_group
- *  @todo what's this?
- */
-
-/* XXX - don't define stuff that potential name conflicts */
-#define MCAST_INTERFACE        2
-#define FILTER           3
-#define TRIGGER          4
-#define TIMER            5
-#define REFRESHTIMER     6
-#define EMPTYSPEED       7
-#define BUFFERALARM      8
-#define CUMULEMPTYSPEED  9
+#ifndef __MCAST_STREAM_H__
+#define __MCAST_STREAM_H__
 
 #define MAX_SPEED 200000
 
 /* typedefs for sliding window and buffer size */
 typedef struct buffer{
-    struct timeval *buff;   /* packet times */
-    gint32 first;              /* pointer to the first element */
-    gint32 last;               /* pointer to the last element */
-    gint32 burstsize;          /* current burst */
-    gint32 topburstsize;       /* maximum burst in the refresh interval*/
-    gint32 count;              /* packet counter */
-    gint32 burststatus;        /* burst status */
-    gint32 numbursts;          /* number of bursts */
-    gint32 buffusage;         /* buffer usage */
-    gint32 buffstatus;        /* buffer status */
-    gint32 numbuffalarms;      /* number of alarms triggered by buffer underruns */
-    gint32 topbuffusage;      /* top buffer usage in refresh interval */
-    float  maxbw;            /* maximum bandwidth usage */
+       struct timeval *buff;   /* packet times */
+       gint32 first;              /* pointer to the first element */
+       gint32 last;               /* pointer to the last element */
+       gint32 burstsize;          /* current burst */
+       gint32 topburstsize;       /* maximum burst in the refresh interval*/
+       gint32 count;              /* packet counter */
+       gint32 burststatus;        /* burst status */
+       gint32 numbursts;          /* number of bursts */
+       gint32 buffusage;          /* buffer usage */
+       gint32 buffstatus;         /* buffer status */
+       gint32 numbuffalarms;      /* number of alarms triggered by buffer underruns */
+       gint32 topbuffusage;       /* top buffer usage in refresh interval */
+       float  maxbw;              /* maximum bandwidth usage */
 } t_buffer;
 
 
@@ -87,12 +67,12 @@ typedef struct _mcast_stream_info {
        /* start of recording (GMT) of this stream */
        guint32 start_sec;         /* seconds */
        guint32 start_usec;        /* microseconds */
-       guint32 start_rel_sec;         /* start stream rel seconds */
-       guint32 start_rel_usec;        /* start stream rel microseconds */
-       guint32 stop_rel_sec;         /* stop stream rel seconds */
-       guint32 stop_rel_usec;        /* stop stream rel microseconds */
+       guint32 start_rel_sec;     /* start stream rel seconds */
+       guint32 start_rel_usec;    /* start stream rel microseconds */
+       guint32 stop_rel_sec;      /* stop stream rel seconds */
+       guint32 stop_rel_usec;     /* stop stream rel microseconds */
        guint16 vlan_id;
-       
+
        /*for the sliding window */
        t_buffer element;
 
@@ -111,6 +91,13 @@ typedef struct _mcaststream_tapinfo {
        gboolean is_registered; /* if the tap listener is currently registered or not */
 } mcaststream_tapinfo_t;
 
+
+extern gint32  mcast_stream_trigger;
+extern gint32  mcast_stream_bufferalarm;
+extern guint16 mcast_stream_burstint;
+extern gint32  mcast_stream_emptyspeed;
+extern gint32  mcast_stream_cumulemptyspeed;
+
 /****************************************************************************/
 /* INTERFACE */
 
@@ -146,4 +133,4 @@ void mcaststream_reset(mcaststream_tapinfo_t *tapinfo);
 */
 void mcaststream_scan(void);
 
-#endif /*Mcast_STREAM_H_INCLUDED*/
+#endif /* __MCAST_STREAM_H__ */