osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

dumpcap: use the display name in error messages. 

That adds the description, if present, on UN*X, and replaces the ugly
GUID-based name with a friendly name on Windows.


(cherry picked from commit 9b771d2c14)
This commit is contained in:
Guy Harris 2021-02-08 23:16:33 +00:00
parent ab6fb92ba3
commit 089889acf2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dumpcap.c
View File

@ -4044,7 +4044,7 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct
primary_msg = g_strdup_printf("The network adapter \"%s\" "
"is no longer running; the "
"capture has stopped.",
interface_opts->name);
interface_opts->display_name);
secondary_msg = g_strdup("");
} else if (strcmp(cap_err_str, "The interface disappeared") == 0 ||
strcmp(cap_err_str, "read: Device not configured") == 0 ||
@ -4053,7 +4053,7 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct
primary_msg = g_strdup_printf("The network adapter \"%s\" "
"is no longer attached; the "
"capture has stopped.",
interface_opts->name);
interface_opts->display_name);
secondary_msg = g_strdup("");
} else if (g_str_has_prefix(cap_err_str, "The interface disappeared ")) {
/*
@ -4067,7 +4067,7 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct
primary_msg = g_strdup_printf("The network adapter \"%s\" "
"is no longer attached; the "
"capture has stopped.",
interface_opts->name);
interface_opts->display_name);
secondary_msg = g_strdup_printf("If you have not removed that "
"adapter, this may be a bug "
"in Npcap: please report it "
@ -4111,7 +4111,7 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct
primary_msg = g_strdup_printf("The network adapter \"%s\" "
"is no longer attached; the "
"capture has stopped.",
interface_opts->name);
interface_opts->display_name);
secondary_msg = g_strdup_printf("If you have not removed that "
"adapter, this may be a bug "
"in Npcap: please report it "