github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-04-30 13:31:36 +00:00
Code Releases Activity

SCP: Various cleanups.

Browse Source 
- Avoid assignments of void * values.  Cast all memory allocation return values to appropriate types.
- Add output to sim_log where missing in various places.
- Fixed issue with lost file positions after a restore for devices which leverage the UNIT_SEQ flag.
This commit is contained in:
Mark Pizzolato
2013-11-20 09:13:27 -08:00
parent 3519c6c74b
commit 2e85e74699
11 changed files with 110 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sim_sock.c
View File

@@ -134,6 +134,7 @@ static struct sock_errors {
{WSAEISCONN, "Transport endpoint is already connected"},
{WSAECONNRESET, "Connection reset by peer"},
{WSAECONNREFUSED, "Connection refused"},
{WSAECONNABORTED, "Connection aborted"},
{WSAEHOSTUNREACH, "No route to host"},
{WSAEADDRINUSE, "Address already in use"},
#if defined (WSAEAFNOSUPPORT)
@@ -154,14 +155,22 @@ int32 i;
for (i=0; (sock_errors[i].text) && (sock_errors[i].value != err); i++)
;
if (sock_errors[i].value == err)
if (sock_errors[i].value == err) {
printf ("Sockets: %s error %d - %s\n", emsg, err, sock_errors[i].text);
else
if (sim_log)
fprintf (sim_log, "Sockets: %s error %d - %s\n", emsg, err, sock_errors[i].text);
}
else {
#if defined(_WIN32)
printf ("Sockets: %s error %d\n", emsg, err);
if (sim_log)
fprintf (sim_log, "Sockets: %s error %d\n", emsg, err);
#else
printf ("Sockets: %s error %d - %s\n", emsg, err, strerror(err));
if (sim_log)
fprintf (sim_log, "Sockets: %s error %d - %s\n", emsg, err, strerror(err));
#endif
}
if (s != INVALID_SOCKET)
sim_close_sock (s, flg);
return INVALID_SOCKET;
@@ -319,7 +328,7 @@ else {
ips = fixed;
}
for (ip=ips; *ip != NULL; ++ip) {
ai = calloc(1, sizeof(*ai));
ai = (struct addrinfo *)calloc(1, sizeof(*ai));
if (NULL == ai) {
s_freeaddrinfo(result);
return EAI_MEMORY;
@@ -331,7 +340,7 @@ for (ip=ips; *ip != NULL; ++ip) {
ai->ai_addrlen = sizeof(struct sockaddr_in);
ai->ai_canonname = NULL;
ai->ai_next = NULL;
ai->ai_addr = calloc(1, sizeof(struct sockaddr_in));
ai->ai_addr = (struct sockaddr *)calloc(1, sizeof(struct sockaddr_in));
if (NULL == ai->ai_addr) {
free(ai);
s_freeaddrinfo(result);
@@ -348,7 +357,7 @@ for (ip=ips; *ip != NULL; ++ip) {
lai = ai;
}
if (cname) {
result->ai_canonname = calloc(1, strlen(cname)+1);
result->ai_canonname = (char *)calloc(1, strlen(cname)+1);
if (NULL == result->ai_canonname) {
s_freeaddrinfo(result);
return EAI_MEMORY;
@@ -446,7 +455,8 @@ static void load_function(char* function, _func* func_ptr) {
char* msg = "Sockets: Failed to find function '%s' in %s\r\n";
printf (msg, function, lib_name);
if (sim_log) fprintf (sim_log, msg, function, lib_name);
if (sim_log)
fprintf (sim_log, msg, function, lib_name);
lib_loaded = 3;
}
}
@@ -881,7 +891,7 @@ if (newsock == INVALID_SOCKET) { /* error? */
return INVALID_SOCKET;
}
if (connectaddr != NULL) {
*connectaddr = calloc(1, NI_MAXHOST+1);
*connectaddr = (char *)calloc(1, NI_MAXHOST+1);
#ifdef AF_INET6
p_getnameinfo((struct sockaddr *)&clientname, size, *connectaddr, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
if (0 == memcmp("::ffff:", *connectaddr, 7)) /* is this a IPv4-mapped IPv6 address? */
@@ -989,9 +999,9 @@ char hostbuf[NI_MAXHOST+1];
char portbuf[NI_MAXSERV+1];
if (socknamebuf)
*socknamebuf = calloc(1, NI_MAXHOST+NI_MAXSERV+4);
*socknamebuf = (char *)calloc(1, NI_MAXHOST+NI_MAXSERV+4);
if (peernamebuf)
*peernamebuf = calloc(1, NI_MAXHOST+NI_MAXSERV+4);
*peernamebuf = (char *)calloc(1, NI_MAXHOST+NI_MAXSERV+4);
getsockname (sock, (struct sockaddr *)&sockname, &socknamesize);
getpeername (sock, (struct sockaddr *)&peername, &peernamesize);
if (socknamebuf != NULL) {
@@ -1024,6 +1034,7 @@ if (rbytes == SOCKET_ERROR) {
if ((err != WSAETIMEDOUT) && /* expected errors after a connect failure */
(err != WSAEHOSTUNREACH) &&
(err != WSAECONNREFUSED) &&
(err != WSAECONNABORTED) &&
(err != WSAECONNRESET))
sim_err_sock (INVALID_SOCKET, "read", 0);
return -1;