folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ETHER: Add local system adapter description to the attach confirmation message

Browse source
This commit is contained in:
Mark Pizzolato 2016-02-04 10:17:50 -08:00
parent 9d2079df68
commit 9df1b0e5b5
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sim_ether.c
View file

@ -570,7 +570,7 @@ void eth_packet_trace_detail(ETH_DEV* dev, const uint8 *msg, int len, const char
eth_packet_trace_ex(dev, msg, len, txt, 1 , dev->dbit); eth_packet_trace_ex(dev, msg, len, txt, 1 , dev->dbit);
} }
char* eth_getname(int number, char* name) char* eth_getname(int number, char* name, char *desc)
{ {
ETH_LIST list[ETH_MAX_DEVICE]; ETH_LIST list[ETH_MAX_DEVICE];
int count = eth_devices(ETH_MAX_DEVICE, list); int count = eth_devices(ETH_MAX_DEVICE, list);
@ -578,10 +578,11 @@ char* eth_getname(int number, char* name)
if ((number < 0) || (count <= number)) if ((number < 0) || (count <= number))
return NULL; return NULL;
strcpy(name, list[number].name); strcpy(name, list[number].name);
strcpy(desc, list[number].desc);
return name; return name;
} }
char* eth_getname_bydesc(char* desc, char* name) char* eth_getname_bydesc(char* desc, char* name, char *ndesc)
{ {
ETH_LIST list[ETH_MAX_DEVICE]; ETH_LIST list[ETH_MAX_DEVICE];
int count = eth_devices(ETH_MAX_DEVICE, list); int count = eth_devices(ETH_MAX_DEVICE, list);
@ -600,6 +601,7 @@ char* eth_getname_bydesc(char* desc, char* name)
/* found a case-insensitive description match */ /* found a case-insensitive description match */
strcpy(name, list[i].name); strcpy(name, list[i].name);
strcpy(ndesc, list[i].desc);
return name; return name;
} }
/* not found */ /* not found */
@ -627,7 +629,7 @@ int eth_strncasecmp(char* string1, char* string2, size_t len)
return 0; return 0;
} }
char* eth_getname_byname(char* name, char* temp) char* eth_getname_byname(char* name, char* temp, char *desc)
{ {
ETH_LIST list[ETH_MAX_DEVICE]; ETH_LIST list[ETH_MAX_DEVICE];
int count = eth_devices(ETH_MAX_DEVICE, list); int count = eth_devices(ETH_MAX_DEVICE, list);
@ -641,6 +643,7 @@ char* eth_getname_byname(char* name, char* temp)
(eth_strncasecmp(name, list[i].name, n) == 0)) { (eth_strncasecmp(name, list[i].name, n) == 0)) {
found = 1; found = 1;
strcpy(temp, list[i].name); /* only case might be different */ strcpy(temp, list[i].name); /* only case might be different */
strcpy(desc, list[i].desc);
} }
} }
return (found ? temp : NULL); return (found ? temp : NULL);
@ -2062,7 +2065,7 @@ t_stat eth_open(ETH_DEV* dev, char* name, DEVICE* dptr, uint32 dbit)
t_stat r; t_stat r;
int bufsz = (BUFSIZ < ETH_MAX_PACKET) ? ETH_MAX_PACKET : BUFSIZ; int bufsz = (BUFSIZ < ETH_MAX_PACKET) ? ETH_MAX_PACKET : BUFSIZ;
char errbuf[PCAP_ERRBUF_SIZE]; char errbuf[PCAP_ERRBUF_SIZE];
char temp[1024]; char temp[1024], desc[1024] = "";
char* savname = name; char* savname = name;
int num; int num;
@ -2080,18 +2083,20 @@ if ((strlen(name) == 4)
&& isdigit(name[3]) && isdigit(name[3])
) { ) {
num = atoi(&name[3]); num = atoi(&name[3]);
savname = eth_getname(num, temp); savname = eth_getname(num, temp, desc);
if (savname == NULL) /* didn't translate */ if (savname == NULL) /* didn't translate */
return SCPE_OPENERR; return SCPE_OPENERR;
} }
else { else {
/* are they trying to use device description? */ /* are they trying to use device description? */
savname = eth_getname_bydesc(name, temp); savname = eth_getname_bydesc(name, temp, desc);
if (savname == NULL) { /* didn't translate */ if (savname == NULL) { /* didn't translate */
/* probably is not ethX and has no description */ /* probably is not ethX and has no description */
savname = eth_getname_byname(name, temp); savname = eth_getname_byname(name, temp, desc);
if (savname == NULL) /* didn't translate */ if (savname == NULL) {/* didn't translate */
savname = name; savname = name;
desc[0] = '\0'; /* no description */
}
} }
} }
@ -2104,7 +2109,7 @@ if (errbuf[0]) {
if (r != SCPE_OK) if (r != SCPE_OK)
return r; return r;
sim_printf ("Eth: opened OS device %s\r\n", savname); sim_printf ("Eth: opened OS device %s%s%s\r\n", savname, desc[0] ? " - " : "", desc);
/* get the NIC's hardware MAC address */ /* get the NIC's hardware MAC address */
eth_get_nic_hw_addr(dev, savname); eth_get_nic_hw_addr(dev, savname);