Skip to content
Browse files

Merge pull request #181 from ffainelli/master

socketlib: properly fix the IPv6 to IPv4 fallback code.
  • Loading branch information...
2 parents eb8dad5 + 0847706 commit 617cbf5b2348ade5afe8cf9ab657f6eb865fa3dc @ffainelli ffainelli committed Mar 12, 2013
Showing with 34 additions and 22 deletions.
  1. +33 −21 socketlib.c
  2. +1 −1 socketlib.h
View
54 socketlib.c
@@ -39,17 +39,29 @@
#include <openssl/bio.h>
#include <openssl/buffer.h>
-int common_setup(struct addrinfo *pAddrInfo)
-{
+int common_setup(struct addrinfo **ppAddrInfo, int pPort)
+{
int tSock;
+ struct addrinfo *pAddrInfo = *ppAddrInfo;
+
//printAddrs(pAddrInfo);
tSock = socket(pAddrInfo->ai_family, pAddrInfo->ai_socktype, 0);
#ifdef AF_INET6
if((tSock==-1) && (pAddrInfo->ai_family == AF_INET6) && (errno == EAFNOSUPPORT))
{
//Fallback to ipv4
perror("Failed to create ipv6 socket. Trying ipv4");
- pAddrInfo->ai_family = AF_INET;
+ (*ppAddrInfo)->ai_family = AF_INET;
+ if (pPort != -1)
+ {
+ char tService[SERVLEN];
+ sprintf(tService, "%d", pPort); // copies port to string
+ int tFamily = AF_INET;
+ if(getAddr(NULL, tService, tFamily, SOCK_STREAM, ppAddrInfo))
+ {
+ return ERROR; // getAddr prints out error message
+ }
+ }
tSock = socket(pAddrInfo->ai_family, pAddrInfo->ai_socktype, 0);
}
#endif
@@ -63,7 +75,7 @@ int setup_client(struct addrinfo *server_host)
while(tIdx++ < RETRY_COUNT)
{
- tSockDesc = common_setup(server_host);
+ tSockDesc = common_setup(&server_host, -1);
if (tSockDesc < 0 && tIdx >= RETRY_COUNT)
{
perror("Error: Could not create socket");
@@ -107,9 +119,23 @@ int getAddr(char *pHostname, char *pService, int pFamily, int pSockType, struct
return tError;
}
-int setup_server(struct addrinfo *server_addr)
+int setup_server(struct addrinfo *server_addr, int pPort)
{
- int tSock = common_setup(server_addr);
+ char tService[SERVLEN];
+ sprintf(tService, "%d", pPort); // copies port to string
+ int tFamily = AF_INET;
+ #ifdef AF_INET6
+ //printf("Listening on IPv6 Socket\n");
+ tFamily = AF_INET6;
+ #else
+ //printf("Listening on IPv4 Socket");
+ #endif
+ if(getAddr(NULL, tService, tFamily, SOCK_STREAM, &server_addr))
+ {
+ return ERROR; // getAddr prints out error message
+ }
+
+ int tSock = common_setup(&server_addr, pPort);
if (tSock < 0)
{
perror("Error: Could not create server socket");
@@ -154,21 +180,7 @@ int acceptClient(int pSock, struct addrinfo *server_addr)
int setupListenServer(struct addrinfo **pAddrInfo, int pPort)
{
- char tService[SERVLEN];
- sprintf(tService, "%d", pPort); // copies port to string
- int tFamily = AF_INET;
- #ifdef AF_INET6
- //printf("Listening on IPv6 Socket\n");
- tFamily = AF_INET6;
- #else
- //printf("Listening on IPv4 Socket");
- #endif
- if(getAddr(NULL, tService, tFamily, SOCK_STREAM, pAddrInfo))
- {
- return ERROR; // getAddr prints out error message
- }
-
- int tSocketDescriptor = setup_server(*pAddrInfo);
+ int tSocketDescriptor = setup_server(*pAddrInfo, pPort);
char tAddr[INET6_ADDRSTRLEN];
socklen_t tSize = INET6_ADDRSTRLEN;
inet_ntop((*pAddrInfo)->ai_family, (*pAddrInfo)->ai_addr, tAddr, tSize);
View
2 socketlib.h
@@ -24,7 +24,7 @@
#define DEFAULT_UNIX "/unix"
int setup_client(struct addrinfo *server_info);
-int setup_server(struct addrinfo *server_address);
+int setup_server(struct addrinfo *server_address, int pPort);
int setupListenServer(struct addrinfo **pAddrInfo, int pPort);
int acceptClient(int pSock, struct addrinfo *server_addr);
void delay(long pMillisecs, struct timeval *pRes);

0 comments on commit 617cbf5

Please sign in to comment.
Something went wrong with that request. Please try again.