Skip to content

Commit 6fdbf8e

Browse files
kala13xkala13x
committed
Refactored XSocket
1 parent 8cccb66 commit 6fdbf8e

File tree

6 files changed

+24
-27
lines changed

6 files changed

+24
-27
lines changed

‎src/net/api.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,10 +1255,10 @@ XSTATUS XAPI_Connect(xapi_t *pApi, xapi_endpoint_t *pEndpt)
12551255

12561256
if (pEndpt->bUnix)
12571257
{
1258-
XSock_InitAddr(&addrInfo);
1258+
XSock_InitInfo(&addrInfo);
12591259
xstrncpy(addrInfo.sAddr, sizeof(addrInfo.sAddr), pEndpt->pAddr);
12601260
}
1261-
else if (XSock_GetAddr(&addrInfo, pEndpt->pAddr) < 0)
1261+
else if (XSock_GetAddrInfo(&addrInfo, pEndpt->pAddr) < 0)
12621262
{
12631263
XAPI_ErrorCb(pApi, NULL, XAPI_NONE, XAPI_ERR_RESOLVE);
12641264
return XSTDERR;

‎src/net/http.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ xhttp_status_t XHTTP_Connect(xhttp_t *pHttp, xsock_t *pSock, xlink_t *pLink)
10221022
}
10231023

10241024
xsock_info_t addrInfo;
1025-
XSock_InitAddr(&addrInfo);
1025+
XSock_InitInfo(&addrInfo);
10261026

10271027
if (!xstrused(pHttp->sUnixAddr))
10281028
{
@@ -1032,7 +1032,7 @@ xhttp_status_t XHTTP_Connect(xhttp_t *pHttp, xsock_t *pSock, xlink_t *pLink)
10321032
xstrncat(pLink->sHost, sizeof(pLink->sHost), ":%d", pLink->nPort);
10331033
}
10341034

1035-
if (XSock_GetAddr(&addrInfo, pLink->sHost) < 0)
1035+
if (XSock_GetAddrInfo(&addrInfo, pLink->sHost) < 0)
10361036
return XHTTP_StatusCb(pHttp, XHTTP_ERRRESOLVE);
10371037

10381038
if (!addrInfo.nPort) addrInfo.nPort = pLink->nPort;

‎src/net/ntp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ int XNTP_GetDate(const char *pAddr, uint16_t nPort, xtime_t *pTime)
7777
if (!nPort) nPort = XNTP_DEF_PORT;
7878

7979
xsock_info_t sockAddr;
80-
XSock_GetAddr(&sockAddr, pAddr);
80+
XSock_GetAddrInfo(&sockAddr, pAddr);
8181
sockAddr.nPort = nPort;
8282

8383
xsock_t sock;

‎src/net/sock.c‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -955,10 +955,10 @@ size_t XSock_SinAddr(const struct in_addr inAddr, char *pAddr, size_t nSize)
955955
return XSock_IPStr(inAddr.s_addr, pAddr, nSize);
956956
}
957957

958-
size_t XSock_IPAddr(xsock_t *pSock, char *pAddr, size_t nSize)
958+
size_t XSock_IPAddr(const xsock_t *pSock, char *pAddr, size_t nSize)
959959
{
960-
if (XFLAGS_CHECK(pSock->nFlags, XSOCK_UNIX)) return 0;
961-
struct sockaddr_in *pInAddr = &pSock->sockAddr.inAddr;
960+
if (XFLAGS_CHECK(pSock->nFlags, XSOCK_UNIX)) return XSOCK_NONE;
961+
const struct sockaddr_in *pInAddr = &pSock->sockAddr.inAddr;
962962
return XSock_SinAddr(pInAddr->sin_addr, pAddr, nSize);
963963
}
964964

@@ -977,7 +977,6 @@ XSTATUS XSock_AddrInfo(xsock_info_t *pAddr, xsock_family_t eFam, const char *pHo
977977
hints.ai_next = NULL;
978978

979979
if (getaddrinfo(pHost, NULL, &hints, &res)) return nRetVal;
980-
xstrncpy(pAddr->sHost, sizeof(pAddr->sHost), pHost);
981980
pAddr->eFamily = XF_UNDEF;
982981

983982
for (rp = res; rp != NULL; rp = rp->ai_next)
@@ -1019,19 +1018,18 @@ XSTATUS XSock_AddrInfo(xsock_info_t *pAddr, xsock_family_t eFam, const char *pHo
10191018
return nRetVal;
10201019
}
10211020

1022-
void XSock_InitAddr(xsock_info_t *pAddr)
1021+
void XSock_InitInfo(xsock_info_t *pAddr)
10231022
{
1024-
pAddr->sHost[0] = XSTR_NUL;
10251023
pAddr->sName[0] = XSTR_NUL;
10261024
pAddr->sAddr[0] = XSTR_NUL;
10271025
pAddr->nAddr = XSTDNON;
10281026
pAddr->nPort = XSTDNON;
10291027
pAddr->eFamily = XF_UNDEF;
10301028
}
10311029

1032-
XSTATUS XSock_GetAddr(xsock_info_t *pAddr, const char *pHost)
1030+
XSTATUS XSock_GetAddrInfo(xsock_info_t *pAddr, const char *pHost)
10331031
{
1034-
XSock_InitAddr(pAddr);
1032+
XSock_InitInfo(pAddr);
10351033
if (pHost == NULL) return XSOCK_ERROR;
10361034

10371035
char sHost[XSOCK_INFO_MAX + XSOCK_ADDR_MAX];
@@ -1049,9 +1047,9 @@ XSTATUS XSock_GetAddr(xsock_info_t *pAddr, const char *pHost)
10491047
return pAddr->nPort ? XSOCK_SUCCESS : XSOCK_NONE;
10501048
}
10511049

1052-
XSTATUS XSock_Addr(xsock_info_t *pInfo, struct sockaddr_in *pAddr, size_t nSize)
1050+
XSTATUS XSock_GetAddr(xsock_info_t *pInfo, struct sockaddr_in *pAddr, size_t nSize)
10531051
{
1054-
XSock_InitAddr(pInfo);
1052+
XSock_InitInfo(pInfo);
10551053
pInfo->eFamily = XF_IPV4;
10561054

10571055
struct hostent *pHostInfo = gethostbyaddr((char*)&pAddr->sin_addr.s_addr, (int)nSize, AF_INET);
@@ -1259,7 +1257,7 @@ XSOCKET XSock_AddMembership(xsock_t* pSock, const char* pGroup)
12591257
return pSock->nFD;
12601258
}
12611259

1262-
XSTATUS XSock_LoadPKCS12(xsocket_ssl_cert_t *pCert, const char *p12Path, const char *p12Pass)
1260+
XSTATUS XSock_LoadPKCS12(xsock_ssl_cert_t *pCert, const char *p12Path, const char *p12Pass)
12631261
{
12641262
pCert->nStatus = 0;
12651263
#ifdef XSOCK_USE_SSL
@@ -1335,7 +1333,7 @@ XSOCKET XSock_SetSSLCert(xsock_t *pSock, xsock_cert_t *pCert)
13351333

13361334
if (xstrused(pCert->p12Path))
13371335
{
1338-
xsocket_ssl_cert_t sslCert;
1336+
xsock_ssl_cert_t sslCert;
13391337
if (!XSock_LoadPKCS12(&sslCert, pCert->p12Path, pCert->p12Pass))
13401338
{
13411339
pSock->eStatus = XSOCK_ERR_PKCS12;
@@ -1715,7 +1713,7 @@ XSOCKET XSock_Setup(xsock_t *pSock, uint32_t nFlags, const char *pAddr)
17151713
return XSock_Create(pSock, nFlags, pAddr, 0);
17161714

17171715
xsock_info_t addrInfo;
1718-
if (XSock_GetAddr(&addrInfo, pAddr) <= 0)
1716+
if (XSock_GetAddrInfo(&addrInfo, pAddr) <= 0)
17191717
{
17201718
pSock->eStatus = XSOCK_ERR_ADDR;
17211719
pSock->nFD = XSOCK_INVALID;

‎src/net/sock.h‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ typedef enum {
107107
XF_IPV6 = 6
108108
} xsock_family_t;
109109

110-
/* Supported socket types and roles */
110+
/* Supported socket types, roles and flags */
111111
typedef enum {
112112
XSOCK_TCP = (1 << 0),
113113
XSOCK_UDP = (1 << 1),
@@ -133,7 +133,6 @@ typedef enum {
133133

134134
typedef struct XSocketInfo {
135135
char sAddr[XSOCK_ADDR_MAX];
136-
char sHost[XSOCK_INFO_MAX];
137136
char sName[XSOCK_INFO_MAX];
138137
xsock_family_t eFamily;
139138
uint32_t nAddr;
@@ -145,7 +144,7 @@ typedef struct XSocketSSLCert {
145144
void *pCert;
146145
void *pKey;
147146
void *pCa;
148-
} xsocket_ssl_cert_t;
147+
} xsock_ssl_cert_t;
149148

150149
typedef struct XSocketCert {
151150
const char *pCertPath;
@@ -226,7 +225,7 @@ void XSock_InitSSL(void);
226225
void XSock_DeinitSSL(void);
227226
int XSock_LastSSLError(char* pDst, size_t nSize);
228227

229-
XSTATUS XSock_LoadPKCS12(xsocket_ssl_cert_t* pCert, const char* p12Path, const char* p12Pass);
228+
XSTATUS XSock_LoadPKCS12(xsock_ssl_cert_t* pCert, const char* p12Path, const char* p12Pass);
230229
XSOCKET XSock_SetSSLCert(xsock_t* pSock, xsock_cert_t* pCert);
231230
void XSock_InitCert(xsock_cert_t *pCert);
232231

@@ -253,13 +252,13 @@ XSOCKET XSock_AcceptNB(xsock_t* pSock);
253252

254253
uint32_t XSock_NetAddr(const char* pAddr);
255254
size_t XSock_SinAddr(const struct in_addr inAddr, char* pAddr, size_t nSize);
256-
size_t XSock_IPAddr(xsock_t* pSock, char* pAddr, size_t nSize);
255+
size_t XSock_IPAddr(const xsock_t* pSock, char* pAddr, size_t nSize);
257256
size_t XSock_IPStr(const uint32_t nAddr, char* pStr, size_t nSize);
258257

259-
void XSock_InitAddr(xsock_info_t* pAddr);
258+
void XSock_InitInfo(xsock_info_t* pAddr);
259+
XSTATUS XSock_GetAddrInfo(xsock_info_t* pAddr, const char* pHost);
260260
XSTATUS XSock_AddrInfo(xsock_info_t* pAddr, xsock_family_t eFam, const char* pHost);
261-
XSTATUS XSock_GetAddr(xsock_info_t* pAddr, const char* pHost);
262-
XSTATUS XSock_Addr(xsock_info_t* pInfo, struct sockaddr_in* pAddr, size_t nSize);
261+
XSTATUS XSock_GetAddr(xsock_info_t* pInfo, struct sockaddr_in* pAddr, size_t nSize);
263262

264263
XSOCKET XSock_AddMembership(xsock_t* pSock, const char* pGroup);
265264
XSOCKET XSock_ReuseAddr(xsock_t* pSock, xbool_t nEnabled);

‎src/xver.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#define XUTILS_VERSION_MAX 2
1414
#define XUTILS_VERSION_MIN 6
15-
#define XUTILS_BUILD_NUMBER 14
15+
#define XUTILS_BUILD_NUMBER 15
1616

1717
#ifdef __cplusplus
1818
extern "C" {

0 commit comments

Comments
 (0)