fanasina/y_project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

y_node: try to debug node.loc_addr initialization

Browse Source
This commit is contained in:
fanasina
2025-10-19 22:33:06 +02:00
parent a487818d8a
commit 7b0181e2f0
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
y_socket_t/src/y_socket_t/y_node_t.c
+12 -8
View File
@@ -48,10 +48,12 @@ int y_NODE_T_cmp(y_NODE_T nodeA, y_NODE_T nodeB){
}else }else
if(nodeA.addr.ss_family == AF_INET6){ if(nodeA.addr.ss_family == AF_INET6){
ret = ((struct sockaddr_in6*)&(nodeA.addr))->sin6_port - ((struct sockaddr_in6*)&(nodeB.addr))->sin6_port; ret = ((struct sockaddr_in6*)&(nodeA.addr))->sin6_port - ((struct sockaddr_in6*)&(nodeB.addr))->sin6_port;
if(ret ==0) if(ret ==0){
//ret = memcmp((struct sockaddr_in6*)&(nodeA.addr), (struct sockaddr_in6*)&(nodeB.addr), sizeof(struct sockaddr_in6)); //ret = memcmp((struct sockaddr_in6*)&(nodeA.addr), (struct sockaddr_in6*)&(nodeB.addr), sizeof(struct sockaddr_in6));
//ret = memcmp(GET_IN_type_ADDR(&(nodeA.addr),6), GET_IN_type_ADDR(&(nodeB.addr),6), 8); //ret = memcmp(GET_IN_type_ADDR(&(nodeA.addr),6), GET_IN_type_ADDR(&(nodeB.addr),6), 8);
ret = memcmp(((struct sockaddr_in6*)&(nodeA.addr))->sin6_addr.s6_addr , ((struct sockaddr_in6*)&(nodeB.addr))->sin6_addr.s6_addr, 8); int len_s6_addr = sizeof(struct in6_addr);
ret = memcmp(((struct sockaddr_in6*)&(nodeA.addr))->sin6_addr.s6_addr , ((struct sockaddr_in6*)&(nodeB.addr))->sin6_addr.s6_addr, len_s6_addr);
}
} }
} }
//} //}
@@ -92,11 +94,11 @@ int set_addr_y_NODE_T_from_str_addr(y_NODE_T *node, char * addrStr){
} }
node->addr_len = sizeof(struct sockaddr_storage); node->addr_len = sizeof(struct sockaddr_storage);
if(strcmp(addrStr,"::1")==0){ /*if(strcmp(addrStr,"::1")==0){
node->local_addr=1; node->local_addr=1;
}else{ }else{
node->local_addr=0; node->local_addr=0;
} }*/
return ret; return ret;
} }
@@ -195,12 +197,14 @@ void* update_nodes(void* arg)
#endif #endif
// node.local_addr = 0; // node.local_addr = 0;
//struct sockaddr_in6 local6;
//inet_pton(AF_INET6, "::1", &local6);
if(NULL == search_node_in_list_y_NODE_T(nodes, node)){ if(NULL == search_node_in_list_y_NODE_T(nodes, node)){
struct ifaddrs *if_addr=NULL; struct ifaddrs *if_addr=NULL;
getifaddrs(&if_addr); getifaddrs(&if_addr);
struct sockaddr_in6 local6;
inet_pton(AF_INET6, "::1", &local6);
int len_s6_addr = sizeof(struct in6_addr);
int c_af = node.addr.ss_family; int c_af = node.addr.ss_family;
node.local_addr = 0;
for(struct ifaddrs *cur_ifa = if_addr; cur_ifa; cur_ifa=cur_ifa->ifa_next){ for(struct ifaddrs *cur_ifa = if_addr; cur_ifa; cur_ifa=cur_ifa->ifa_next){
if( c_af == cur_ifa->ifa_addr->sa_family){ if( c_af == cur_ifa->ifa_addr->sa_family){
if(c_af==AF_INET){ if(c_af==AF_INET){
@@ -210,8 +214,8 @@ void* update_nodes(void* arg)
} }
}else if(c_af==AF_INET6){ }else if(c_af==AF_INET6){
if( if(
//(memcmp(((struct sockaddr_in6*)&(node.addr))->sin6_addr.s6_addr , local6.sin6_addr.s6_addr, 8)==0)|| (memcmp(((struct sockaddr_in6*)&(node.addr))->sin6_addr.s6_addr , local6.sin6_addr.s6_addr, len_s6_addr)==0)||
(memcmp(((struct sockaddr_in6*)&(node.addr))->sin6_addr.s6_addr , ((struct sockaddr_in6*)&(cur_ifa->ifa_addr))->sin6_addr.s6_addr, 8)==0) (memcmp(((struct sockaddr_in6*)&(node.addr))->sin6_addr.s6_addr , ((struct sockaddr_in6*)&(cur_ifa->ifa_addr))->sin6_addr.s6_addr, len_s6_addr)==0)
){ ){
node.local_addr = 1; node.local_addr = 1;
break; break;