Fixed IPv6 bug (sockaddr size too small) when binding socket to address
This commit is contained in:
32
easysock.c
32
easysock.c
@@ -51,11 +51,23 @@ void create_addr(int network, char* address, int port,struct sockaddr* dest) {
|
|||||||
|
|
||||||
int create_local (int network, char transport, char* address, int port,struct sockaddr* addr_struct) {
|
int create_local (int network, char transport, char* address, int port,struct sockaddr* addr_struct) {
|
||||||
int socket = create_socket(network,transport);
|
int socket = create_socket(network,transport);
|
||||||
if (socket == -1) {
|
if (socket < 0) {
|
||||||
exit(-1);
|
printf("Something went wrong creating the socket: %s\n",strerror(errno));
|
||||||
}
|
}
|
||||||
create_addr(network,address,port,addr_struct);
|
create_addr(network,address,port,addr_struct);
|
||||||
int addrlen = sizeof(*addr_struct);
|
int addrlen;
|
||||||
|
if (network == 4) {
|
||||||
|
addrlen = sizeof(struct sockaddr_in);
|
||||||
|
} else if (network == 6) {
|
||||||
|
addrlen = sizeof(struct sockaddr_in6);
|
||||||
|
} else {
|
||||||
|
exit(-7);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The value of addrlen should be the size of the 'sockaddr'.
|
||||||
|
This should be set to the size of 'sockaddr_in' for IPv4, and 'sockaddr_in6' for IPv6.
|
||||||
|
See https://stackoverflow.com/questions/73707162/socket-bind-failed-with-invalid-argument-error-for-program-running-on-macos */
|
||||||
|
|
||||||
int i = bind (socket,addr_struct,(socklen_t)addrlen);
|
int i = bind (socket,addr_struct,(socklen_t)addrlen);
|
||||||
if (i < 0) {
|
if (i < 0) {
|
||||||
printf("Something went wrong: %s\n",strerror(errno));
|
printf("Something went wrong: %s\n",strerror(errno));
|
||||||
@@ -73,7 +85,19 @@ int create_remote (int network,char transport,char* address,int port) {
|
|||||||
}
|
}
|
||||||
struct sockaddr remote_addr_struct;
|
struct sockaddr remote_addr_struct;
|
||||||
create_addr(network,address,port,&remote_addr_struct);
|
create_addr(network,address,port,&remote_addr_struct);
|
||||||
int addrlen = sizeof(remote_addr_struct);
|
int addrlen;
|
||||||
|
if (network == 4) {
|
||||||
|
addrlen = sizeof(struct sockaddr_in);
|
||||||
|
} else if (network == 6) {
|
||||||
|
addrlen = sizeof(struct sockaddr_in6);
|
||||||
|
} else {
|
||||||
|
exit(-7);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The value of addrlen should be the size of the 'sockaddr'.
|
||||||
|
This should be set to the size of 'sockaddr_in' for IPv4, and 'sockaddr_in6' for IPv6.
|
||||||
|
See https://stackoverflow.com/questions/73707162/socket-bind-failed-with-invalid-argument-error-for-program-running-on-macos */
|
||||||
|
|
||||||
int i = connect(socket,&remote_addr_struct,(socklen_t)addrlen);
|
int i = connect(socket,&remote_addr_struct,(socklen_t)addrlen);
|
||||||
if (i < 0) {
|
if (i < 0) {
|
||||||
printf("Something went wrong: %s\n",strerror(errno));
|
printf("Something went wrong: %s\n",strerror(errno));
|
||||||
|
Reference in New Issue
Block a user