sec_vt_header: dissect call_id

[metze/wireshark/wip.git] / capture-wpcap.c

diff --git a/capture-wpcap.c b/capture-wpcap.c
index f831f225f1d04387d0517d2faefca08c29bbbdb7..2467dc7be0becc2fc095c1bbbb65b634df8a8f00 100644 (file)
--- a/capture-wpcap.c
+++ b/capture-wpcap.c
@@ -21,22 +21,21 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <glib.h>
 #include <gmodule.h>
 
+#include <epan/strutil.h>
+
 #include "capture_ifinfo.h"
 #include "capture-pcap-util.h"
 #include "capture-pcap-util-int.h"
 #include "capture-wpcap.h"
-#include "capture_errs.h"
 
 #include <wsutil/file_util.h>
 
@@ -128,7 +127,7 @@ typedef struct {
        gboolean        optional;
 } symbol_table_t;
 
-#define SYM(x, y)      { STRINGIFY(x) , (gpointer) &CONCAT(p_,x), y }
+#define SYM(x, y)      { G_STRINGIFY(x) , (gpointer) &CONCAT(p_,x), y }
 
 void
 load_wpcap(void)
@@ -232,6 +231,34 @@ load_wpcap(void)
        has_wpcap = TRUE;
 }
 
+/*
+ * The official list of WinPcap mirrors is at
+ * http://www.winpcap.org/misc/mirrors.htm
+ */
+char *
+cant_load_winpcap_err(const char *app_name)
+{
+       return g_strdup_printf(
+"Unable to load WinPcap (wpcap.dll); %s will not be able to capture\n"
+"packets.\n"
+"\n"
+"In order to capture packets, WinPcap must be installed; see\n"
+"\n"
+"        http://www.winpcap.org/\n"
+"\n"
+"or the mirror at\n"
+"\n"
+"        http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/\n"
+"\n"
+"or the mirror at\n"
+"\n"
+"        http://winpcap.cs.pu.edu.tw/\n"
+"\n"
+"for a downloadable version of WinPcap and for instructions on how to install\n"
+"WinPcap.",
+           app_name);
+}
+
 char*
 pcap_lookupdev (char *a)
 {
@@ -792,12 +819,12 @@ get_interface_list(int *err, char **err_str)
                                j = 0;
                                while (names[i] != 0) {
                                        if (j < MAX_WIN_IF_NAME_LEN)
-                                       ascii_name[j++] = (char) names[i++];
+                                               ascii_name[j++] = (char) names[i++];
                                }
                                ascii_name[j] = '\0';
                                i++;
                                il = g_list_append(il,
-                                   if_info_new(ascii_name, ascii_desc));
+                                   if_info_new(ascii_name, ascii_desc, FALSE));
                        }
                } else {
                        /*
@@ -817,7 +844,7 @@ get_interface_list(int *err, char **err_str)
                                 * that interface's description.
                                 */
                                il = g_list_append(il,
-                                   if_info_new(&win95names[i], desc));
+                                   if_info_new(&win95names[i], desc, FALSE));
 
                                /*
                                 * Skip to the next description.
@@ -876,7 +903,7 @@ cant_get_if_list_error_message(const char *err_str)
 void
 get_compiled_pcap_version(GString *str)
 {
-       g_string_append(str, "with WinPcap (version unknown)");
+       g_string_append(str, "with WinPcap (" G_STRINGIFY(WINPCAP_VERSION) ")");
 }
 
 /*