generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix warnings about "sin" conflicting with sin(3) definition.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2006-02-09 17:17:41 +00:00
parent 346ac30120
commit d7db77a0cb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crypto/bio/b_sock.c
View File

@ -585,7 +585,7 @@ int BIO_get_accept_socket(char *host, int bind_mode)
{ {
int ret=0; int ret=0;
struct sockaddr server,client; struct sockaddr server,client;
struct sockaddr_in *sin; struct sockaddr_in *sa_in;
int s=INVALID_SOCKET,cs; int s=INVALID_SOCKET,cs;
unsigned char ip[4]; unsigned char ip[4];
unsigned short port; unsigned short port;
@ -665,12 +665,12 @@ int BIO_get_accept_socket(char *host, int bind_mode)
if (!BIO_get_port(p,&port)) goto err; if (!BIO_get_port(p,&port)) goto err;
memset((char *)&server,0,sizeof(server)); memset((char *)&server,0,sizeof(server));
sin = (struct sockaddr_in *)&server; sa_in = (struct sockaddr_in *)&server;
sin->sin_family=AF_INET; sa_in->sin_family=AF_INET;
sin->sin_port=htons(port); sa_in->sin_port=htons(port);
if (h == NULL || strcmp(h,"*") == 0) if (h == NULL || strcmp(h,"*") == 0)
sin->sin_addr.s_addr=INADDR_ANY; sa_in->sin_addr.s_addr=INADDR_ANY;
else else
{ {
if (!BIO_get_host_ip(h,&(ip[0]))) goto err; if (!BIO_get_host_ip(h,&(ip[0]))) goto err;
@ -679,7 +679,7 @@ int BIO_get_accept_socket(char *host, int bind_mode)
((unsigned long)ip[1]<<16L)| ((unsigned long)ip[1]<<16L)|
((unsigned long)ip[2]<< 8L)| ((unsigned long)ip[2]<< 8L)|
((unsigned long)ip[3]); ((unsigned long)ip[3]);
sin->sin_addr.s_addr=htonl(l); sa_in->sin_addr.s_addr=htonl(l);
} }
again: again:
@ -774,7 +774,7 @@ int BIO_accept(int sock, char **addr)
{ {
int ret=INVALID_SOCKET; int ret=INVALID_SOCKET;
struct sockaddr from; struct sockaddr from;
struct sockaddr_in *sin; struct sockaddr_in *sa_in;
unsigned long l; unsigned long l;
unsigned short port; unsigned short port;
int len; int len;
@ -836,9 +836,9 @@ int BIO_accept(int sock, char **addr)
} while(0); } while(0);
#endif #endif
if (from.sa_family != AF_INET) goto end; if (from.sa_family != AF_INET) goto end;
sin = (struct sockaddr_in *)&from; sa_in = (struct sockaddr_in *)&from;
l=ntohl(sin->sin_addr.s_addr); l=ntohl(sa_in->sin_addr.s_addr);
port=ntohs(sin->sin_port); port=ntohs(sa_in->sin_port);
if (*addr == NULL) if (*addr == NULL)
{ {
if ((p=OPENSSL_malloc(24)) == NULL) if ((p=OPENSSL_malloc(24)) == NULL)