80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Failback for PCAP to use name as description if the later is blank

Browse Source 
This allows 86Box to use pcap properly under WINE under Linux as most
interfaces on Linux leave the description as a NULL.

Signed-off-by: Michael Casadevall <michael@casadevall.pro>
This commit is contained in:
Michael Casadevall
2020-11-07 10:02:59 -05:00
parent cfb559de13
commit 42419baa16
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/network/net_pcap.c
View File

@@ -261,17 +261,24 @@ net_pcap_prepare(netdev_t *list)
}
for (dev=devlist; dev!=NULL; dev=dev->next) {
if (strlen(dev->name) <= 127)
strcpy(list->device, dev->name);
else
strncpy(list->device, dev->name, 127);
if (dev->description) {
if (strlen(dev->description) <= 127)
strcpy(list->description, dev->description);
else
strncpy(list->description, dev->description, 127);
} else
/**
* we initialize the strings to NULL first for strncpy
*/
memset(list->device, '\0', sizeof(list->device));
memset(list->description, '\0', sizeof(list->description));
strncpy(list->device, dev->name, 127);
if (dev->description) {
if (strlen(dev->description) <= 127)
strcpy(list->description, dev->description);
else
strncpy(list->description, dev->description, 127);
} else {
/* if description is NULL, set the name. This allows pcap to display *something* useful under WINE */
strncpy(list->description, dev->name, sizeof(list->description)-1);
}
list++; i++;
}