mirror of
https://github.com/rcornwell/sims.git
synced 2026-01-13 23:35:30 +00:00
SCP: Updated to current.
This commit is contained in:
Richard Cornwell
parent
41fc24c065
commit
079c2e26ce
9
scp.c
9
scp.c
@ -7680,8 +7680,13 @@ for (i = 0; i < (device_count + sim_internal_device_count); i++) {/* loop thru d
|
||||
fputc ('\n', sfile); /* end registers */
|
||||
}
|
||||
fputc ('\n', sfile); /* end devices */
|
||||
if (!ferror (sfile))
|
||||
sim_set_fsize (sfile, (t_addr)sim_ftell (sfile)); /* truncate the save file */
|
||||
if (!ferror (sfile)) {
|
||||
t_offset pos = sim_ftell (sfile); /* get current position */
|
||||
|
||||
if (pos < 0) /* error? */
|
||||
return SCPE_IOERR; /* done! */
|
||||
sim_set_fsize (sfile, (t_addr)pos); /* truncate the save file */
|
||||
}
|
||||
return (ferror (sfile))? SCPE_IOERR: SCPE_OK; /* error during save? */
|
||||
}
|
||||
|
||||
|
||||
91
sim_ether.c
91
sim_ether.c
@ -1194,7 +1194,7 @@ int load_pcap(void) {
|
||||
|
||||
/* define functions with dynamic revectoring */
|
||||
void pcap_close(pcap_t* a) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
p_pcap_close(a);
|
||||
}
|
||||
}
|
||||
@ -1205,7 +1205,7 @@ int pcap_compile(pcap_t* a, struct bpf_program* b, char* c, int d, bpf_u_int32 e
|
||||
#else
|
||||
int pcap_compile(pcap_t* a, struct bpf_program* b, const char* c, int d, bpf_u_int32 e) {
|
||||
#endif
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
return p_pcap_compile(a, b, c, d, e);
|
||||
} else {
|
||||
return 0;
|
||||
@ -1230,7 +1230,7 @@ const char *pcap_lib_version(void) {
|
||||
}
|
||||
|
||||
int pcap_datalink(pcap_t* a) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
return p_pcap_datalink(a);
|
||||
} else {
|
||||
return 0;
|
||||
@ -1238,7 +1238,7 @@ int pcap_datalink(pcap_t* a) {
|
||||
}
|
||||
|
||||
int pcap_dispatch(pcap_t* a, int b, pcap_handler c, u_char* d) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
return p_pcap_dispatch(a, b, c, d);
|
||||
} else {
|
||||
return 0;
|
||||
@ -1246,7 +1246,7 @@ int pcap_dispatch(pcap_t* a, int b, pcap_handler c, u_char* d) {
|
||||
}
|
||||
|
||||
int pcap_findalldevs(pcap_if_t** a, char* b) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
return p_pcap_findalldevs(a, b);
|
||||
} else {
|
||||
*a = 0;
|
||||
@ -1257,19 +1257,19 @@ int pcap_findalldevs(pcap_if_t** a, char* b) {
|
||||
}
|
||||
|
||||
void pcap_freealldevs(pcap_if_t* a) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
p_pcap_freealldevs(a);
|
||||
}
|
||||
}
|
||||
|
||||
void pcap_freecode(struct bpf_program* a) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
p_pcap_freecode(a);
|
||||
}
|
||||
}
|
||||
|
||||
char* pcap_geterr(pcap_t* a) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
return p_pcap_geterr(a);
|
||||
} else {
|
||||
return (char*) "";
|
||||
@ -1294,7 +1294,7 @@ pcap_t* pcap_open_live(const char* a, int b, int c, int d, char* e) {
|
||||
|
||||
#ifdef _WIN32
|
||||
int pcap_setmintocopy(pcap_t* a, int b) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
return p_pcap_setmintocopy(a, b);
|
||||
} else {
|
||||
return -1;
|
||||
@ -1302,7 +1302,7 @@ int pcap_setmintocopy(pcap_t* a, int b) {
|
||||
}
|
||||
|
||||
HANDLE pcap_getevent(pcap_t* a) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
return p_pcap_getevent(a);
|
||||
} else {
|
||||
return (HANDLE) 0;
|
||||
@ -1312,7 +1312,7 @@ HANDLE pcap_getevent(pcap_t* a) {
|
||||
#else
|
||||
#ifdef MUST_DO_SELECT
|
||||
int pcap_get_selectable_fd(pcap_t* a) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
return p_pcap_get_selectable_fd(a);
|
||||
} else {
|
||||
return 0;
|
||||
@ -1321,7 +1321,7 @@ int pcap_get_selectable_fd(pcap_t* a) {
|
||||
#endif
|
||||
|
||||
int pcap_fileno(pcap_t * a) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
return p_pcap_fileno(a);
|
||||
} else {
|
||||
return 0;
|
||||
@ -1330,7 +1330,7 @@ int pcap_fileno(pcap_t * a) {
|
||||
#endif
|
||||
|
||||
int pcap_sendpacket(pcap_t* a, const u_char* b, int c) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
return p_pcap_sendpacket(a, b, c);
|
||||
} else {
|
||||
return 0;
|
||||
@ -1338,7 +1338,7 @@ int pcap_sendpacket(pcap_t* a, const u_char* b, int c) {
|
||||
}
|
||||
|
||||
int pcap_setfilter(pcap_t* a, struct bpf_program* b) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
return p_pcap_setfilter(a, b);
|
||||
} else {
|
||||
return 0;
|
||||
@ -1346,7 +1346,7 @@ int pcap_setfilter(pcap_t* a, struct bpf_program* b) {
|
||||
}
|
||||
|
||||
int pcap_setnonblock(pcap_t* a, int nonblock, char *errbuf) {
|
||||
if (a && (load_pcap() != 0)) {
|
||||
if (load_pcap() != 0) {
|
||||
return p_pcap_setnonblock(a, nonblock, errbuf);
|
||||
} else {
|
||||
return 0;
|
||||
@ -1616,7 +1616,7 @@ static void eth_get_nic_hw_addr(ETH_DEV* dev, const char *devname)
|
||||
break;
|
||||
}
|
||||
fclose(f);
|
||||
remove("NIC.hwaddr");
|
||||
(void)remove("NIC.hwaddr");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1673,13 +1673,17 @@ FILE *f;
|
||||
|
||||
memset (buf, 0, buf_size);
|
||||
if ((f = fopen ("/etc/machine-id", "r"))) {
|
||||
if (fread (buf, 1, buf_size - 1, f)) {};
|
||||
fclose (f);
|
||||
if (fread (buf, 1, buf_size - 1, f))
|
||||
fclose (f);
|
||||
else
|
||||
fclose (f);
|
||||
}
|
||||
else {
|
||||
if ((f = popen ("hostname", "r"))) {
|
||||
if (fread (buf, 1, buf_size - 1, f)) {};
|
||||
pclose (f);
|
||||
if (fread (buf, 1, buf_size - 1, f))
|
||||
pclose (f);
|
||||
else
|
||||
pclose (f);
|
||||
}
|
||||
}
|
||||
while ((strlen (buf) > 0) && sim_isspace(buf[strlen (buf) - 1]))
|
||||
@ -1936,8 +1940,15 @@ while (dev->handle) {
|
||||
/* Put buffer on free buffer list */
|
||||
request->next = dev->write_buffers;
|
||||
dev->write_buffers = request;
|
||||
request = NULL;
|
||||
}
|
||||
}
|
||||
/* If we exited these loops with a request allocated, */
|
||||
/* avoid buffer leaking by putting it on free buffer list */
|
||||
if (request) {
|
||||
request->next = dev->write_buffers;
|
||||
dev->write_buffers = request;
|
||||
}
|
||||
pthread_mutex_unlock (&dev->writer_lock);
|
||||
|
||||
sim_debug(dev->dbit, dev->dptr, "Writer Thread Exiting\n");
|
||||
@ -2020,7 +2031,7 @@ if (0 == strncmp("tap:", savname, 4)) {
|
||||
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
/* Set up interface flags */
|
||||
strcpy(ifr.ifr_name, devname);
|
||||
strlcpy(ifr.ifr_name, devname, sizeof(ifr.ifr_name));
|
||||
ifr.ifr_flags = IFF_TAP|IFF_NO_PI;
|
||||
|
||||
/* Send interface requests to TUN/TAP driver. */
|
||||
@ -2028,9 +2039,10 @@ if (0 == strncmp("tap:", savname, 4)) {
|
||||
if (ioctl(tun, FIONBIO, &on)) {
|
||||
strlcpy(errbuf, strerror(errno), PCAP_ERRBUF_SIZE);
|
||||
close(tun);
|
||||
tun = -1;
|
||||
}
|
||||
else {
|
||||
*fd_handle = tun;
|
||||
*fd_handle = (SOCKET)tun;
|
||||
strcpy(savname, ifr.ifr_name);
|
||||
}
|
||||
}
|
||||
@ -2039,6 +2051,10 @@ if (0 == strncmp("tap:", savname, 4)) {
|
||||
}
|
||||
else
|
||||
strlcpy(errbuf, strerror(errno), PCAP_ERRBUF_SIZE);
|
||||
if ((tun >= 0) && (errbuf[0] != 0)) {
|
||||
close(tun);
|
||||
tun = -1;
|
||||
}
|
||||
#elif defined(HAVE_BSDTUNTAP) && defined(HAVE_TAP_NETWORK)
|
||||
if (1) {
|
||||
char dev_name[64] = "";
|
||||
@ -2050,9 +2066,10 @@ if (0 == strncmp("tap:", savname, 4)) {
|
||||
if (ioctl(tun, FIONBIO, &on)) {
|
||||
strlcpy(errbuf, strerror(errno), PCAP_ERRBUF_SIZE);
|
||||
close(tun);
|
||||
tun = -1;
|
||||
}
|
||||
else {
|
||||
*fd_handle = tun;
|
||||
*fd_handle = (SOCKET)tun;
|
||||
strcpy(savname, devname);
|
||||
}
|
||||
#if defined (__APPLE__)
|
||||
@ -2069,6 +2086,7 @@ if (0 == strncmp("tap:", savname, 4)) {
|
||||
if (ioctl(s, SIOCSIFFLAGS, (caddr_t)&ifr)) {
|
||||
strlcpy(errbuf, strerror(errno), PCAP_ERRBUF_SIZE);
|
||||
close(tun);
|
||||
tun = -1;
|
||||
}
|
||||
}
|
||||
close(s);
|
||||
@ -2078,7 +2096,11 @@ if (0 == strncmp("tap:", savname, 4)) {
|
||||
}
|
||||
else
|
||||
strlcpy(errbuf, strerror(errno), PCAP_ERRBUF_SIZE);
|
||||
}
|
||||
if ((tun >= 0) && (errbuf[0] != 0)) {
|
||||
close(tun);
|
||||
tun = -1;
|
||||
}
|
||||
}
|
||||
#else
|
||||
strlcpy(errbuf, "No support for tap: devices", PCAP_ERRBUF_SIZE);
|
||||
#endif /* !defined(__linux) && !defined(HAVE_BSDTUNTAP) */
|
||||
@ -2116,7 +2138,7 @@ else { /* !tap: */
|
||||
strlcpy(errbuf, strerror(errno), PCAP_ERRBUF_SIZE);
|
||||
else {
|
||||
*eth_api = ETH_API_VDE;
|
||||
*fd_handle = vde_datafd((VDECONN*)(*handle));
|
||||
*fd_handle = (SOCKET)vde_datafd((VDECONN*)(*handle));
|
||||
}
|
||||
#else
|
||||
strlcpy(errbuf, "No support for vde: network devices", PCAP_ERRBUF_SIZE);
|
||||
@ -3066,15 +3088,22 @@ cksum += (cksum >> 16);
|
||||
return (uint16)(~cksum);
|
||||
}
|
||||
|
||||
/*
|
||||
* src_addr and dest_addr are presented in network byte order
|
||||
*/
|
||||
|
||||
static uint16
|
||||
pseudo_checksum(uint16 len, uint16 proto, uint16 *src_addr, uint16 *dest_addr, uint8 *buff)
|
||||
pseudo_checksum(uint16 len, uint16 proto, void *nsrc_addr, void *ndest_addr, uint8 *buff)
|
||||
{
|
||||
uint32 sum;
|
||||
uint16 *src_addr = (uint16 *)nsrc_addr;
|
||||
uint16 *dest_addr = (uint16 *)ndest_addr;
|
||||
|
||||
/* Sum the data first */
|
||||
sum = 0xffff&(~ip_checksum((uint16 *)buff, len));
|
||||
|
||||
/* add the pseudo header which contains the IP source and destinationn addresses */
|
||||
/* add the pseudo header which contains the IP source and
|
||||
destination addresses already in network byte order */
|
||||
sum += src_addr[0];
|
||||
sum += src_addr[1];
|
||||
sum += dest_addr[0];
|
||||
@ -3135,7 +3164,7 @@ switch (IP->proto) {
|
||||
break; /* UDP Checksums are disabled */
|
||||
orig_checksum = UDP->checksum;
|
||||
UDP->checksum = 0;
|
||||
UDP->checksum = pseudo_checksum(ntohs(UDP->length), IPPROTO_UDP, (uint16 *)(&IP->source_ip), (uint16 *)(&IP->dest_ip), (uint8 *)UDP);
|
||||
UDP->checksum = pseudo_checksum(ntohs(UDP->length), IPPROTO_UDP, &IP->source_ip, &IP->dest_ip, (uint8 *)UDP);
|
||||
if (orig_checksum != UDP->checksum)
|
||||
eth_packet_trace (dev, msg, len, "reading jumbo UDP header Checksum Fixed");
|
||||
break;
|
||||
@ -3244,7 +3273,7 @@ switch (IP->proto) {
|
||||
IP->checksum = 0;
|
||||
IP->checksum = ip_checksum((uint16 *)IP, IP_HLEN(IP));
|
||||
TCP->checksum = 0;
|
||||
TCP->checksum = pseudo_checksum(ntohs(IP->total_len)-IP_HLEN(IP), IPPROTO_TCP, (uint16 *)(&IP->source_ip), (uint16 *)(&IP->dest_ip), (uint8 *)TCP);
|
||||
TCP->checksum = pseudo_checksum(ntohs(IP->total_len)-IP_HLEN(IP), IPPROTO_TCP, &IP->source_ip, &IP->dest_ip, (uint8 *)TCP);
|
||||
header.caplen = header.len = 14 + ntohs(IP->total_len);
|
||||
eth_packet_trace_ex (dev, ((u_char *)IP)-14, header.len, "reading TCP segment", 1, dev->dbit);
|
||||
#if ETH_MIN_JUMBO_FRAME < ETH_MAX_PACKET
|
||||
@ -3316,7 +3345,7 @@ switch (IP->proto) {
|
||||
return; /* UDP Checksums are disabled */
|
||||
orig_checksum = UDP->checksum;
|
||||
UDP->checksum = 0;
|
||||
UDP->checksum = pseudo_checksum(ntohs(UDP->length), IPPROTO_UDP, (uint16 *)(&IP->source_ip), (uint16 *)(&IP->dest_ip), (uint8 *)UDP);
|
||||
UDP->checksum = pseudo_checksum(ntohs(UDP->length), IPPROTO_UDP, &IP->source_ip, &IP->dest_ip, (uint8 *)UDP);
|
||||
if (orig_checksum != UDP->checksum)
|
||||
eth_packet_trace (dev, msg, len, "reading UDP header Checksum Fixed");
|
||||
break;
|
||||
@ -3324,7 +3353,7 @@ switch (IP->proto) {
|
||||
TCP = (struct TCPHeader *)(((char *)IP)+IP_HLEN(IP));
|
||||
orig_checksum = TCP->checksum;
|
||||
TCP->checksum = 0;
|
||||
TCP->checksum = pseudo_checksum(ntohs(IP->total_len)-IP_HLEN(IP), IPPROTO_TCP, (uint16 *)(&IP->source_ip), (uint16 *)(&IP->dest_ip), (uint8 *)TCP);
|
||||
TCP->checksum = pseudo_checksum(ntohs(IP->total_len)-IP_HLEN(IP), IPPROTO_TCP, &IP->source_ip, &IP->dest_ip, (uint8 *)TCP);
|
||||
if (orig_checksum != TCP->checksum)
|
||||
eth_packet_trace (dev, msg, len, "reading TCP header Checksum Fixed");
|
||||
break;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user