planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved finding reply sockets. (Still to do for IPv6)

Browse Source 
FossilOrigin-Name: 5bcd2e9c537b284e8ed85af9bdcf300a457f89d54d249b9c19619ebdca5d2d24
This commit is contained in:
7u83@mail.ru
2014-07-26 18:23:46 +00:00
parent e96ccd6cb5
commit c81640f712
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ac/socklist.c
View File

@ -46,7 +46,7 @@ int socklist_init()
socklist = malloc(sizeof(struct socklistelem) * SOCKLIST_SIZE); socklist = malloc(sizeof(struct socklistelem) * SOCKLIST_SIZE);
memset(socklist,0,sizeof(struct socklistelem)*SOCKLIST_SIZE); memset(socklist,0,sizeof(struct socklistelem) * SOCKLIST_SIZE);
if (!socklist){ if (!socklist){
cw_log(LOG_ERR,"Fatal error while initializing socklist: %s",strerror(errno)); cw_log(LOG_ERR,"Fatal error while initializing socklist: %s",strerror(errno));
return 0; return 0;
@ -82,6 +82,9 @@ void socklist_destroy()
static int find_reply_socket(struct sockaddr *sa,int bc) static int find_reply_socket(struct sockaddr *sa,int bc)
{ {
printf("Looking for best sock of: %s\n",sockaddr2str(sa));
int bestsockfd = -1; int bestsockfd = -1;
int i; int i;
for (i=0; i<socklist_len; i++){ for (i=0; i<socklist_len; i++){
@ -96,6 +99,16 @@ static int find_reply_socket(struct sockaddr *sa,int bc)
if (sa->sa_family!=sn.ss_family) if (sa->sa_family!=sn.ss_family)
continue; continue;
if (sn.ss_family == AF_INET){
int p1 = ntohs(((struct sockaddr_in *)sa)->sin_port);
int p2 = ntohs(((struct sockaddr_in *)&sn)->sin_port);
if (p1 != p2)
continue;
}
if (bestsockfd == -1) if (bestsockfd == -1)
bestsockfd = socklist[i].sockfd; bestsockfd = socklist[i].sockfd;
@ -135,7 +148,7 @@ void socklist_del_connection(int index)
int socklist_add_multicast(const char * addr, const char * port) int socklist_add_multicast(const char * addr, const char * port,int ac_proto)
{ {
struct addrinfo hints; struct addrinfo hints;
@ -217,6 +230,7 @@ int socklist_add_multicast(const char * addr, const char * port)
socklist[socklist_len].reply_sockfd=rfd; socklist[socklist_len].reply_sockfd=rfd;
socklist[socklist_len].type=SOCKLIST_BCASTMCAST_SOCKET; socklist[socklist_len].type=SOCKLIST_BCASTMCAST_SOCKET;
socklist[socklist_len].family=sa->sa_family; socklist[socklist_len].family=sa->sa_family;
socklist[socklist_len].ac_proto=ac_proto;
socklist_len++; socklist_len++;
@ -228,7 +242,7 @@ int socklist_add_multicast(const char * addr, const char * port)
} }
int socklist_add_unicast(const char *addr, const char * port) int socklist_add_unicast(const char *addr, const char * port, int ac_proto)
{ {
struct addrinfo hints; struct addrinfo hints;
struct addrinfo * res,*res0; struct addrinfo * res,*res0;
@ -265,6 +279,7 @@ int socklist_add_unicast(const char *addr, const char * port)
socklist[socklist_len].reply_sockfd=sockfd; socklist[socklist_len].reply_sockfd=sockfd;
socklist[socklist_len].family=sa->sa_family; socklist[socklist_len].family=sa->sa_family;
socklist[socklist_len].type=SOCKLIST_UNICAST_SOCKET; socklist[socklist_len].type=SOCKLIST_UNICAST_SOCKET;
socklist[socklist_len].ac_proto=ac_proto;
socklist_len++; socklist_len++;
cw_log(LOG_INFO,"Bound to: %s (%i)\n",addr,sockfd); cw_log(LOG_INFO,"Bound to: %s (%i)\n",addr,sockfd);
@ -274,7 +289,7 @@ int socklist_add_unicast(const char *addr, const char * port)
return 1; return 1;
} }
int socklist_add_broadcast(const char *addr, const char * port) int socklist_add_broadcast(const char *addr, const char * port,int ac_proto)
{ {
struct addrinfo hints; struct addrinfo hints;
struct addrinfo * res,*res0; struct addrinfo * res,*res0;
@ -329,9 +344,12 @@ int socklist_add_broadcast(const char *addr, const char * port)
socklist[socklist_len].reply_sockfd=rfd; socklist[socklist_len].reply_sockfd=rfd;
socklist[socklist_len].type=SOCKLIST_BCASTMCAST_SOCKET; socklist[socklist_len].type=SOCKLIST_BCASTMCAST_SOCKET;
socklist[socklist_len].family=sa->sa_family; socklist[socklist_len].family=sa->sa_family;
socklist[socklist_len].ac_proto=ac_proto;
printf ("AC INIT PROTO : %d, i %i\n",ac_proto,socklist_len);
printf ("sock proto %d\n",socklist[socklist_len].ac_proto);
socklist_len++; socklist_len++;
cw_log(LOG_INFO,"Bound to broadcast: %s (%i) (R:%i)\n",addr,sockfd,rfd); cw_log(LOG_INFO,"Bound to broadcast: %s:%s (%i,R:%i,I:%d)\n",addr,port,sockfd,rfd,socklist_len-1);
} }
freeaddrinfo(res0); freeaddrinfo(res0);