mirror of
https://github.com/GOSTSec/sgminer
synced 2025-08-26 05:41:55 +00:00
Put all socket definitions in util.h to allow reusing by added socket functions to be used in util.c.
This commit is contained in:
Con Kolivas
parent
346d09c36d
commit
b3cdd8029a
@ -32,7 +32,7 @@ cgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@
|
|||||||
cgminer_SOURCES := cgminer.c
|
cgminer_SOURCES := cgminer.c
|
||||||
|
|
||||||
cgminer_SOURCES += elist.h miner.h compat.h bench_block.h \
|
cgminer_SOURCES += elist.h miner.h compat.h bench_block.h \
|
||||||
util.c uthash.h logging.h \
|
util.c util.h uthash.h logging.h \
|
||||||
sha2.c sha2.h api.c
|
sha2.c sha2.h api.c
|
||||||
|
|
||||||
cgminer_SOURCES += logging.c
|
cgminer_SOURCES += logging.c
|
||||||
|
|||||||
103
api.c
103
api.c
@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
#include "compat.h"
|
#include "compat.h"
|
||||||
#include "miner.h"
|
#include "miner.h"
|
||||||
|
#include "util.h"
|
||||||
#include "driver-cpu.h" /* for algo_names[], TODO: re-factor dependency */
|
#include "driver-cpu.h" /* for algo_names[], TODO: re-factor dependency */
|
||||||
|
|
||||||
#if defined(USE_BITFORCE) || defined(USE_ICARUS) || defined(USE_ZTEX) || defined(USE_MODMINER)
|
#if defined(USE_BITFORCE) || defined(USE_ICARUS) || defined(USE_ZTEX) || defined(USE_MODMINER)
|
||||||
@ -36,109 +37,9 @@
|
|||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
#elif defined WIN32
|
||||||
#define SOCKETTYPE int
|
|
||||||
#define SOCKETFAIL(a) ((a) < 0)
|
|
||||||
#define INVSOCK -1
|
|
||||||
#define INVINETADDR -1
|
|
||||||
#define CLOSESOCKET close
|
|
||||||
|
|
||||||
#define SOCKERRMSG strerror(errno)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
#include <ws2tcpip.h>
|
#include <ws2tcpip.h>
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
|
|
||||||
#define SOCKETTYPE SOCKET
|
|
||||||
#define SOCKETFAIL(a) ((a) == SOCKET_ERROR)
|
|
||||||
#define INVSOCK INVALID_SOCKET
|
|
||||||
#define INVINETADDR INADDR_NONE
|
|
||||||
#define CLOSESOCKET closesocket
|
|
||||||
|
|
||||||
static char WSAbuf[1024];
|
|
||||||
|
|
||||||
struct WSAERRORS {
|
|
||||||
int id;
|
|
||||||
char *code;
|
|
||||||
} WSAErrors[] = {
|
|
||||||
{ 0, "No error" },
|
|
||||||
{ WSAEINTR, "Interrupted system call" },
|
|
||||||
{ WSAEBADF, "Bad file number" },
|
|
||||||
{ WSAEACCES, "Permission denied" },
|
|
||||||
{ WSAEFAULT, "Bad address" },
|
|
||||||
{ WSAEINVAL, "Invalid argument" },
|
|
||||||
{ WSAEMFILE, "Too many open sockets" },
|
|
||||||
{ WSAEWOULDBLOCK, "Operation would block" },
|
|
||||||
{ WSAEINPROGRESS, "Operation now in progress" },
|
|
||||||
{ WSAEALREADY, "Operation already in progress" },
|
|
||||||
{ WSAENOTSOCK, "Socket operation on non-socket" },
|
|
||||||
{ WSAEDESTADDRREQ, "Destination address required" },
|
|
||||||
{ WSAEMSGSIZE, "Message too long" },
|
|
||||||
{ WSAEPROTOTYPE, "Protocol wrong type for socket" },
|
|
||||||
{ WSAENOPROTOOPT, "Bad protocol option" },
|
|
||||||
{ WSAEPROTONOSUPPORT, "Protocol not supported" },
|
|
||||||
{ WSAESOCKTNOSUPPORT, "Socket type not supported" },
|
|
||||||
{ WSAEOPNOTSUPP, "Operation not supported on socket" },
|
|
||||||
{ WSAEPFNOSUPPORT, "Protocol family not supported" },
|
|
||||||
{ WSAEAFNOSUPPORT, "Address family not supported" },
|
|
||||||
{ WSAEADDRINUSE, "Address already in use" },
|
|
||||||
{ WSAEADDRNOTAVAIL, "Can't assign requested address" },
|
|
||||||
{ WSAENETDOWN, "Network is down" },
|
|
||||||
{ WSAENETUNREACH, "Network is unreachable" },
|
|
||||||
{ WSAENETRESET, "Net connection reset" },
|
|
||||||
{ WSAECONNABORTED, "Software caused connection abort" },
|
|
||||||
{ WSAECONNRESET, "Connection reset by peer" },
|
|
||||||
{ WSAENOBUFS, "No buffer space available" },
|
|
||||||
{ WSAEISCONN, "Socket is already connected" },
|
|
||||||
{ WSAENOTCONN, "Socket is not connected" },
|
|
||||||
{ WSAESHUTDOWN, "Can't send after socket shutdown" },
|
|
||||||
{ WSAETOOMANYREFS, "Too many references, can't splice" },
|
|
||||||
{ WSAETIMEDOUT, "Connection timed out" },
|
|
||||||
{ WSAECONNREFUSED, "Connection refused" },
|
|
||||||
{ WSAELOOP, "Too many levels of symbolic links" },
|
|
||||||
{ WSAENAMETOOLONG, "File name too long" },
|
|
||||||
{ WSAEHOSTDOWN, "Host is down" },
|
|
||||||
{ WSAEHOSTUNREACH, "No route to host" },
|
|
||||||
{ WSAENOTEMPTY, "Directory not empty" },
|
|
||||||
{ WSAEPROCLIM, "Too many processes" },
|
|
||||||
{ WSAEUSERS, "Too many users" },
|
|
||||||
{ WSAEDQUOT, "Disc quota exceeded" },
|
|
||||||
{ WSAESTALE, "Stale NFS file handle" },
|
|
||||||
{ WSAEREMOTE, "Too many levels of remote in path" },
|
|
||||||
{ WSASYSNOTREADY, "Network system is unavailable" },
|
|
||||||
{ WSAVERNOTSUPPORTED, "Winsock version out of range" },
|
|
||||||
{ WSANOTINITIALISED, "WSAStartup not yet called" },
|
|
||||||
{ WSAEDISCON, "Graceful shutdown in progress" },
|
|
||||||
{ WSAHOST_NOT_FOUND, "Host not found" },
|
|
||||||
{ WSANO_DATA, "No host data of that type was found" },
|
|
||||||
{ -1, "Unknown error code" }
|
|
||||||
};
|
|
||||||
|
|
||||||
static char *WSAErrorMsg()
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
int id = WSAGetLastError();
|
|
||||||
|
|
||||||
/* Assume none of them are actually -1 */
|
|
||||||
for (i = 0; WSAErrors[i].id != -1; i++)
|
|
||||||
if (WSAErrors[i].id == id)
|
|
||||||
break;
|
|
||||||
|
|
||||||
sprintf(WSAbuf, "Socket Error: (%d) %s", id, WSAErrors[i].code);
|
|
||||||
|
|
||||||
return &(WSAbuf[0]);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define SOCKERRMSG WSAErrorMsg()
|
|
||||||
|
|
||||||
#ifndef SHUT_RDWR
|
|
||||||
#define SHUT_RDWR SD_BOTH
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef in_addr_t
|
|
||||||
#define in_addr_t uint32_t
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Big enough for largest API request
|
// Big enough for largest API request
|
||||||
|
|||||||
104
util.h
Normal file
104
util.h
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
#ifndef __UTIL_H__
|
||||||
|
#define __UTIL_H__
|
||||||
|
|
||||||
|
#if defined(unix) || defined(__APPLE__)
|
||||||
|
#define SOCKETTYPE int
|
||||||
|
#define SOCKETFAIL(a) ((a) < 0)
|
||||||
|
#define INVSOCK -1
|
||||||
|
#define INVINETADDR -1
|
||||||
|
#define CLOSESOCKET close
|
||||||
|
|
||||||
|
#define SOCKERRMSG strerror(errno)
|
||||||
|
#elif defined WIN32
|
||||||
|
#define SOCKETTYPE SOCKET
|
||||||
|
#define SOCKETFAIL(a) ((a) == SOCKET_ERROR)
|
||||||
|
#define INVSOCK INVALID_SOCKET
|
||||||
|
#define INVINETADDR INADDR_NONE
|
||||||
|
#define CLOSESOCKET closesocket
|
||||||
|
|
||||||
|
static char WSAbuf[1024];
|
||||||
|
|
||||||
|
struct WSAERRORS {
|
||||||
|
int id;
|
||||||
|
char *code;
|
||||||
|
} WSAErrors[] = {
|
||||||
|
{ 0, "No error" },
|
||||||
|
{ WSAEINTR, "Interrupted system call" },
|
||||||
|
{ WSAEBADF, "Bad file number" },
|
||||||
|
{ WSAEACCES, "Permission denied" },
|
||||||
|
{ WSAEFAULT, "Bad address" },
|
||||||
|
{ WSAEINVAL, "Invalid argument" },
|
||||||
|
{ WSAEMFILE, "Too many open sockets" },
|
||||||
|
{ WSAEWOULDBLOCK, "Operation would block" },
|
||||||
|
{ WSAEINPROGRESS, "Operation now in progress" },
|
||||||
|
{ WSAEALREADY, "Operation already in progress" },
|
||||||
|
{ WSAENOTSOCK, "Socket operation on non-socket" },
|
||||||
|
{ WSAEDESTADDRREQ, "Destination address required" },
|
||||||
|
{ WSAEMSGSIZE, "Message too long" },
|
||||||
|
{ WSAEPROTOTYPE, "Protocol wrong type for socket" },
|
||||||
|
{ WSAENOPROTOOPT, "Bad protocol option" },
|
||||||
|
{ WSAEPROTONOSUPPORT, "Protocol not supported" },
|
||||||
|
{ WSAESOCKTNOSUPPORT, "Socket type not supported" },
|
||||||
|
{ WSAEOPNOTSUPP, "Operation not supported on socket" },
|
||||||
|
{ WSAEPFNOSUPPORT, "Protocol family not supported" },
|
||||||
|
{ WSAEAFNOSUPPORT, "Address family not supported" },
|
||||||
|
{ WSAEADDRINUSE, "Address already in use" },
|
||||||
|
{ WSAEADDRNOTAVAIL, "Can't assign requested address" },
|
||||||
|
{ WSAENETDOWN, "Network is down" },
|
||||||
|
{ WSAENETUNREACH, "Network is unreachable" },
|
||||||
|
{ WSAENETRESET, "Net connection reset" },
|
||||||
|
{ WSAECONNABORTED, "Software caused connection abort" },
|
||||||
|
{ WSAECONNRESET, "Connection reset by peer" },
|
||||||
|
{ WSAENOBUFS, "No buffer space available" },
|
||||||
|
{ WSAEISCONN, "Socket is already connected" },
|
||||||
|
{ WSAENOTCONN, "Socket is not connected" },
|
||||||
|
{ WSAESHUTDOWN, "Can't send after socket shutdown" },
|
||||||
|
{ WSAETOOMANYREFS, "Too many references, can't splice" },
|
||||||
|
{ WSAETIMEDOUT, "Connection timed out" },
|
||||||
|
{ WSAECONNREFUSED, "Connection refused" },
|
||||||
|
{ WSAELOOP, "Too many levels of symbolic links" },
|
||||||
|
{ WSAENAMETOOLONG, "File name too long" },
|
||||||
|
{ WSAEHOSTDOWN, "Host is down" },
|
||||||
|
{ WSAEHOSTUNREACH, "No route to host" },
|
||||||
|
{ WSAENOTEMPTY, "Directory not empty" },
|
||||||
|
{ WSAEPROCLIM, "Too many processes" },
|
||||||
|
{ WSAEUSERS, "Too many users" },
|
||||||
|
{ WSAEDQUOT, "Disc quota exceeded" },
|
||||||
|
{ WSAESTALE, "Stale NFS file handle" },
|
||||||
|
{ WSAEREMOTE, "Too many levels of remote in path" },
|
||||||
|
{ WSASYSNOTREADY, "Network system is unavailable" },
|
||||||
|
{ WSAVERNOTSUPPORTED, "Winsock version out of range" },
|
||||||
|
{ WSANOTINITIALISED, "WSAStartup not yet called" },
|
||||||
|
{ WSAEDISCON, "Graceful shutdown in progress" },
|
||||||
|
{ WSAHOST_NOT_FOUND, "Host not found" },
|
||||||
|
{ WSANO_DATA, "No host data of that type was found" },
|
||||||
|
{ -1, "Unknown error code" }
|
||||||
|
};
|
||||||
|
|
||||||
|
static char *WSAErrorMsg()
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
int id = WSAGetLastError();
|
||||||
|
|
||||||
|
/* Assume none of them are actually -1 */
|
||||||
|
for (i = 0; WSAErrors[i].id != -1; i++)
|
||||||
|
if (WSAErrors[i].id == id)
|
||||||
|
break;
|
||||||
|
|
||||||
|
sprintf(WSAbuf, "Socket Error: (%d) %s", id, WSAErrors[i].code);
|
||||||
|
|
||||||
|
return &(WSAbuf[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#define SOCKERRMSG WSAErrorMsg()
|
||||||
|
|
||||||
|
#ifndef SHUT_RDWR
|
||||||
|
#define SHUT_RDWR SD_BOTH
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef in_addr_t
|
||||||
|
#define in_addr_t uint32_t
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* __UTIL_H__ */
|
||||||
Loading…
x
Reference in New Issue
Block a user