diff options
Diffstat (limited to 'PICA_node.c')
| -rw-r--r-- | PICA_node.c | 1420 |
1 files changed, 710 insertions, 710 deletions
diff --git a/PICA_node.c b/PICA_node.c index 951e8d9..fdd1759 100644 --- a/PICA_node.c +++ b/PICA_node.c @@ -1,4 +1,4 @@ -//Программа является узлом сети +//Программа является узлом сети // #include <stdio.h> #include <stdlib.h> @@ -122,7 +122,7 @@ struct newconn* newconn_add(struct newconn *ncs, int *pos); void PICA_node_joinskynet(const char* addrlistfilename, const char *my_addr); -//описание формата сообщений, которые могут приходить _ОТ_ клиентов по управляющему защищенному соединению +//описание формата сообщений, которые могут приходить _ОТ_ клиентов по управляющему защищенному соединению #define MSGINFO_MSGSNUM(arr) (sizeof(arr)/sizeof(struct PICA_msginfo)) struct PICA_msginfo _msginfo_comm[] = @@ -138,8 +138,8 @@ struct PICA_msginfo _msginfo_comm[] = struct PICA_msginfo _msginfo_node[] = { {PICA_PROTO_INITRESPOK, PICA_MSG_FIXED_SIZE, PICA_PROTO_INITRESPOK_SIZE, procmsg_NODERESP}, - {PICA_PROTO_VERDIFFER , PICA_MSG_FIXED_SIZE, PICA_PROTO_VERDIFFER_SIZE, procmsg_NODERESP}, - {PICA_PROTO_NEWNODE_IPV4 , PICA_MSG_FIXED_SIZE, PICA_PROTO_NEWNODE_IPV4_SIZE, procmsg_NEWNODE}, + {PICA_PROTO_VERDIFFER, PICA_MSG_FIXED_SIZE, PICA_PROTO_VERDIFFER_SIZE, procmsg_NODERESP}, + {PICA_PROTO_NEWNODE_IPV4, PICA_MSG_FIXED_SIZE, PICA_PROTO_NEWNODE_IPV4_SIZE, procmsg_NEWNODE}, {PICA_PROTO_NODELISTREQ, PICA_MSG_FIXED_SIZE, PICA_PROTO_NODELISTREQ_SIZE, procmsg_NODELISTREQ}, {PICA_PROTO_NODELIST, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_NODELIST}, @@ -176,14 +176,14 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) X509_NAME_oneline(X509_get_subject_name(err_cert), buf, 256); if (err == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT && depth == 0) - preverify_ok = 1; + preverify_ok = 1; if (!preverify_ok) { PICA_info("certificate verification error:num=%d:%s:depth=%d:%s\n", err, X509_verify_cert_error_string(err), depth, buf); } - return preverify_ok; + return preverify_ok; } unsigned int procmsg_INITREQ(unsigned char* buf, unsigned int size, void* ptr) @@ -195,36 +195,36 @@ unsigned int procmsg_INITREQ(unsigned char* buf, unsigned int size, void* ptr) if (buf[2] == PICA_PROTO_VER_HIGH && buf[3] == PICA_PROTO_VER_LOW) { - struct client *c; + struct client *c; c = client_list_addnew(nc); - if (!c) - return 0; - - newconn_free(nc); + if (!c) + return 0; + + newconn_free(nc); if ((mp = client_wbuf_push(c, PICA_PROTO_INITRESPOK, PICA_PROTO_INITRESPOK_SIZE))) { mp->tail[0] = 'O'; mp->tail[1] = 'K'; } - + c->state = PICA_CLSTATE_SENDINGRESP; }///////---------<<<<<<<<<<< new client else { - //// PICA_PROTO_VERDIFFER + //// PICA_PROTO_VERDIFFER send(nc->sck, msg_VERDIFFER, msg_VERDIFFER_len, 0); - if (buf[2] > PICA_PROTO_VER_HIGH || (buf[2] == PICA_PROTO_VER_HIGH && buf[3] > PICA_PROTO_VER_LOW)) + if (buf[2] > PICA_PROTO_VER_HIGH || (buf[2] == PICA_PROTO_VER_HIGH && buf[3] > PICA_PROTO_VER_LOW)) { - PICA_warn("Client has newer protocol version than node. Please check if update for pica-node is available"); + PICA_warn("Client has newer protocol version than node. Please check if update for pica-node is available"); } - else + else { - PICA_info("Client has older protocol version. Disconnecting ..."); + PICA_info("Client has older protocol version. Disconnecting ..."); } - return 0; + return 0; } return 1; @@ -251,44 +251,44 @@ unsigned int procmsg_CONNID(unsigned char* buf, unsigned int size, void* ptr) if (!link) { - PICA_debug3("corresponding cclink not found"); - return 0; + PICA_debug3("corresponding cclink not found"); + return 0; } if (link->state != PICA_CCLINK_LOCAL_WAITCONNCLE && link->state != PICA_CCLINK_LOCAL_WAITCONNCLR && link->state != PICA_CCLINK_N2NCLR_WAITCONNCLR && link->state != PICA_CCLINK_N2NCLE_WAITCONNCLE) { - PICA_debug2("found cclink is not in expected state"); - return 0; + PICA_debug2("found cclink is not in expected state"); + return 0; } - + { struct client *c; //проверка IP адреса. //IP адрес должен совпадать с адресом клиента в управляющем соединении if (link->state == PICA_CCLINK_LOCAL_WAITCONNCLE || link->state == PICA_CCLINK_N2NCLE_WAITCONNCLE) - c = link->p2; + c = link->p2; else if (link->state == PICA_CCLINK_LOCAL_WAITCONNCLR || link->state == PICA_CCLINK_N2NCLR_WAITCONNCLR) - c = link->p1; + c = link->p1; if (nc->addr.sin_addr.s_addr != c->addr.sin_addr.s_addr) - { - PICA_warn("CONNID: IP check failed. IP address of sender does not match IP in c2n connection"); - return 0; - } + { + PICA_warn("CONNID: IP check failed. IP address of sender does not match IP in c2n connection"); + return 0; + } } if (link->state == PICA_CCLINK_LOCAL_WAITCONNCLE) { if((mp = client_wbuf_push(link->p1, PICA_PROTO_FOUND, PICA_PROTO_FOUND_SIZE))) { - memcpy(mp->tail, callee_id, PICA_ID_SIZE); + memcpy(mp->tail, callee_id, PICA_ID_SIZE); } - else + else { - cclink_list_delete(link); - return 0; + cclink_list_delete(link); + return 0; } } @@ -296,13 +296,13 @@ unsigned int procmsg_CONNID(unsigned char* buf, unsigned int size, void* ptr) { if((mp = nodelink_wbuf_push(link->caller_node, PICA_PROTO_N2NALLOW, PICA_PROTO_N2NALLOW_SIZE))) { - memcpy(mp->tail, caller_id, PICA_ID_SIZE); - memcpy(mp->tail + PICA_ID_SIZE, callee_id, PICA_ID_SIZE); + memcpy(mp->tail, caller_id, PICA_ID_SIZE); + memcpy(mp->tail + PICA_ID_SIZE, callee_id, PICA_ID_SIZE); } - else + else { - cclink_list_delete(link); - return 0; + cclink_list_delete(link); + return 0; } } PICA_debug3("CONNID processed successfully"); @@ -321,13 +321,13 @@ unsigned int procmsg_NODECONNREQ(unsigned char* buf, unsigned int size, void* pt if (buf[2] == PICA_PROTO_VER_HIGH && buf[3] == PICA_PROTO_VER_LOW) { - ////-прием входящего подключения - //-------------------------- - struct nodelink *nl; + ////-прием входящего подключения + //-------------------------- + struct nodelink *nl; nl = nodelink_list_addnew(nc); - newconn_free(nc); - if (!nl) - return 0; + newconn_free(nc); + if (!nl) + return 0; if ((mp = nodelink_wbuf_push(nl, PICA_PROTO_INITRESPOK, PICA_PROTO_INITRESPOK_SIZE))) { @@ -337,20 +337,20 @@ unsigned int procmsg_NODECONNREQ(unsigned char* buf, unsigned int size, void* pt } else { - //// PICA_PROTO_VERDIFFER + //// PICA_PROTO_VERDIFFER send(nc->sck, msg_VERDIFFER, msg_VERDIFFER_len, 0); - if (buf[2] > PICA_PROTO_VER_HIGH || (buf[2] == PICA_PROTO_VER_HIGH && buf[3] > PICA_PROTO_VER_LOW)) + if (buf[2] > PICA_PROTO_VER_HIGH || (buf[2] == PICA_PROTO_VER_HIGH && buf[3] > PICA_PROTO_VER_LOW)) { - PICA_warn("Node %s has newer protocol version [%u, %u]. Please check if update for pica-node is available", - inet_ntoa(nc->addr.sin_addr), buf[2], buf[3]); + PICA_warn("Node %s has newer protocol version [%u, %u]. Please check if update for pica-node is available", + inet_ntoa(nc->addr.sin_addr), buf[2], buf[3]); } - else + else { - PICA_info("Node %s has older protocol version. Disconnecting ...", inet_ntoa(nc->addr.sin_addr)); + PICA_info("Node %s has older protocol version. Disconnecting ...", inet_ntoa(nc->addr.sin_addr)); } - return 0; + return 0; } return ; @@ -364,16 +364,16 @@ void mapfunc_sendsearchreq(struct nodelink *p, const unsigned char *id) mp = nodelink_wbuf_push(p, PICA_PROTO_SEARCH, PICA_PROTO_SEARCH_SIZE); if (mp) - memcpy(mp->tail, id, PICA_ID_SIZE); + memcpy(mp->tail, id, PICA_ID_SIZE); } int nodelink_send_searchreq(const unsigned char *id) { if (!nodelink_list_count) - return 0; + return 0; LISTMAP(nodelink, nodelink, mapfunc_sendsearchreq, id); - + return 1; } @@ -391,43 +391,43 @@ unsigned int procmsg_CONNREQOUTG(unsigned char* buf, unsigned int size, void* pt if ((o = client_tree_search(callee_id))) { - if (cclink_list_search(i->id, callee_id)) + if (cclink_list_search(i->id, callee_id)) { PICA_info("duplicate request for existing c2c connection is ignored"); - return 1; + return 1; } - if (memcmp(i->id, callee_id, PICA_ID_SIZE) == 0) + if (memcmp(i->id, callee_id, PICA_ID_SIZE) == 0) { PICA_info("request to create c2c connection to self is ignored"); - return 1; + return 1; } - //отправить o _CONNREQINC + //отправить o _CONNREQINC if ((mp = client_wbuf_push(o, PICA_PROTO_CONNREQINC, PICA_PROTO_CONNREQINC_SIZE))) { - memcpy(mp->tail, i->id, PICA_ID_SIZE); + memcpy(mp->tail, i->id, PICA_ID_SIZE); cclink_list_addlocal(i, o); - - o->tmst = time(0); - o->disconnect_ticking = 1;//if client does not reply in given time period, client is disconnected - return 1; + + o->tmst = time(0); + o->disconnect_ticking = 1;//if client does not reply in given time period, client is disconnected + return 1; } - - return 1;//сообщение отправить не удалось, но все равно возвращаем 1 + + return 1;//сообщение отправить не удалось, но все равно возвращаем 1 } - + if (cclink_list_findwaitsearch(callee_id)/*search request for this id is already in progress*/ - || nodelink_send_searchreq(callee_id) /*make new search*/) + || nodelink_send_searchreq(callee_id) /*make new search*/) { cclink_list_addn2nclr(i, callee_id); - return 1; + return 1; } - + //отправить i _NOTFOUND if ((mp = client_wbuf_push(i, PICA_PROTO_NOTFOUND, PICA_PROTO_NOTFOUND_SIZE))) { - memcpy(mp->tail, callee_id, PICA_ID_SIZE); + memcpy(mp->tail, callee_id, PICA_ID_SIZE); } return 1; @@ -450,11 +450,11 @@ unsigned int procmsg_CONNALLOW(unsigned char* buf, unsigned int size, void* ptr) link = cclink_list_search(caller_id, callee->id); if (!link) - return 0; + return 0; if (link->state != PICA_CCLINK_LOCAL_WAITREP && link->state != PICA_CCLINK_N2NCLE_WAITREP) - return 0; + return 0; cclink_setwaitconn(link); @@ -479,32 +479,32 @@ unsigned int procmsg_CONNDENY(unsigned char* buf, unsigned int size, void* ptr) link = cclink_list_search(caller_id, callee->id); if (!link) - return 0; + return 0; caller = link -> p1;//check for NULL if not LOCAL if (link->state != PICA_CCLINK_LOCAL_WAITREP && link->state != PICA_CCLINK_N2NCLE_WAITREP) { - cclink_list_delete(link); - return 0; + cclink_list_delete(link); + return 0; } if (link->state == PICA_CCLINK_LOCAL_WAITREP) { - //отправить caller _NOTFOUND + //отправить caller _NOTFOUND if ((mp = client_wbuf_push(caller, PICA_PROTO_NOTFOUND, PICA_PROTO_NOTFOUND_SIZE))) { - memcpy(mp->tail, callee->id, PICA_ID_SIZE); + memcpy(mp->tail, callee->id, PICA_ID_SIZE); } } else if (link->state == PICA_CCLINK_N2NCLE_WAITREP) { - //отправить caller N2NNOTFOUND + //отправить caller N2NNOTFOUND if ((mp = nodelink_wbuf_push(link->caller_node, PICA_PROTO_N2NNOTFOUND, PICA_PROTO_N2NNOTFOUND_SIZE))) { - memcpy(mp->tail, caller_id, PICA_ID_SIZE); - memcpy(mp->tail + PICA_ID_SIZE, callee->id, PICA_ID_SIZE); + memcpy(mp->tail, caller_id, PICA_ID_SIZE); + memcpy(mp->tail + PICA_ID_SIZE, callee->id, PICA_ID_SIZE); } } @@ -525,7 +525,7 @@ unsigned int procmsg_PINGREQ_client(unsigned char* buf, unsigned int size, void* RAND_pseudo_bytes(mp->tail, 2); } else - return 0; + return 0; return 1; } @@ -554,7 +554,7 @@ unsigned int procmsg_PINGREQ_node(unsigned char* buf, unsigned int size, void* p RAND_pseudo_bytes(mp->tail, 2); } else - return 0; + return 0; return 1; } @@ -582,39 +582,39 @@ unsigned int procmsg_NODERESP(unsigned char* buf, unsigned int size, void* ptr) { case PICA_PROTO_INITRESPOK: if (buf[2] != 'O' || buf[3] != 'K') - return 0; + return 0; + - mp = nodelink_wbuf_push(n, PICA_PROTO_NEWNODE_IPV4, PICA_PROTO_NEWNODE_IPV4_SIZE);//IPv6 if (mp) - { + { *((in_addr_t*)(mp->tail)) = inet_addr(nodecfg.announced_addr); *((in_port_t*)(mp->tail + 4)) = (nodecfg.listen_port ? htons(atoi(nodecfg.listen_port)) : htons(PICA_COMM_PORT)); //CONF; - } + } else - return 0; + return 0; mp = nodelink_wbuf_push(n, PICA_PROTO_NODELISTREQ, PICA_PROTO_NODELISTREQ_SIZE); if (mp) - { + { RAND_pseudo_bytes(mp->tail, 2); - } + } else - return 0; - - break; + return 0; + + break; case PICA_PROTO_VERDIFFER: if (buf[2] > PICA_PROTO_VER_HIGH || (buf[3] > PICA_PROTO_VER_LOW && buf[2] == PICA_PROTO_VER_HIGH)) { - PICA_warn("make update of node software - peer node has newer protocol version"); + PICA_warn("make update of node software - peer node has newer protocol version"); } - else + else { //peer node has older software version - PICA_info("peer node has older protocol version"); + PICA_info("peer node has older protocol version"); } - return 0; - break; + return 0; + break; } return 1; @@ -629,42 +629,42 @@ unsigned int procmsg_NEWNODE(unsigned char* buf, unsigned int size, void* ptr) switch (buf[0]) { - case PICA_PROTO_NEWNODE_IPV4: + case PICA_PROTO_NEWNODE_IPV4: PICA_debug1("NEWNODE_IPV4: ip %.16s port %hu\n", inet_ntoa(*(struct in_addr*)(buf + 2)), ntohs(*(in_port_t*)(buf + 6))); - { - struct PICA_nodeaddr_ipv4 na_ipv4; - + { + struct PICA_nodeaddr_ipv4 na_ipv4; + na_ipv4.magick = PICA_PROTO_NEWNODE_IPV4; na_ipv4.addr = *(in_addr_t*)(buf + 2); na_ipv4.port = *(in_port_t*)(buf + 6); - - if (nodelink_search_by_ipv4addr(na_ipv4.addr, na_ipv4.port)) //connection with this node is already established - { - PICA_debug1("disconnecting node %.16s:%hu - connection with this node is already established", inet_ntoa(*(struct in_addr*)&na_ipv4.addr), ntohs(na_ipv4.port)); - return 0; - } - if (nodecfg.disable_reserved_addrs && PICA_is_reserved_addr_ipv4(na_ipv4.addr)) - { - PICA_debug1("disconnecting node %.16s:%hu - private IP ranges are rejected by node configuration", - inet_ntoa(*(struct in_addr*)&na_ipv4.addr), ntohs(na_ipv4.port) - ); - return 0; - } - + if (nodelink_search_by_ipv4addr(na_ipv4.addr, na_ipv4.port)) //connection with this node is already established + { + PICA_debug1("disconnecting node %.16s:%hu - connection with this node is already established", inet_ntoa(*(struct in_addr*)&na_ipv4.addr), ntohs(na_ipv4.port)); + return 0; + } + + if (nodecfg.disable_reserved_addrs && PICA_is_reserved_addr_ipv4(na_ipv4.addr)) + { + PICA_debug1("disconnecting node %.16s:%hu - private IP ranges are rejected by node configuration", + inet_ntoa(*(struct in_addr*)&na_ipv4.addr), ntohs(na_ipv4.port) + ); + return 0; + } + sprintf(na.addr, "%.16s", inet_ntoa(*(struct in_addr*)&na_ipv4.addr)); - na.port = ntohs(na_ipv4.port); - - //int nodelink_attach_nodeaddr(struct nodelink *nl, unsigned int addr_type, void* nodeaddr, unsigned int nodeaddr_size) + na.port = ntohs(na_ipv4.port); + + //int nodelink_attach_nodeaddr(struct nodelink *nl, unsigned int addr_type, void* nodeaddr, unsigned int nodeaddr_size) nodelink_attach_nodeaddr(n, na_ipv4.magick, &na_ipv4, sizeof(struct PICA_nodeaddr_ipv4)); - } - break; + } + break; case PICA_PROTO_NEWNODE_IPV6: #warning "TO DO" - break; + break; case PICA_PROTO_NEWNODE_DNS: #warning "TODO" - break; + break; } PICA_nodeaddr_save(nodecfg.nodes_db_file, &na);//CONF filename @@ -686,17 +686,17 @@ unsigned int procmsg_NODELISTREQ(unsigned char* buf, unsigned int size, void* pt switch(buf[0]) { case PICA_PROTO_CLNODELISTREQ: - c = (struct client *)ptr; - break; + c = (struct client *)ptr; + break; case PICA_PROTO_NODELISTREQ: - n = (struct nodelink *)ptr; - break; + n = (struct nodelink *)ptr; + break; } nl_buf = (unsigned char*)malloc(65536); if (!nl_buf) - return 0;//ERR + return 0;//ERR { @@ -711,32 +711,32 @@ unsigned int procmsg_NODELISTREQ(unsigned char* buf, unsigned int size, void* pt nlp = nodelink_list_head; while(nlp && nl_size < 65532)//MAP { - switch(nlp->addr_type) + switch(nlp->addr_type) { - case PICA_PROTO_NEWNODE_IPV4: - if ( PICA_PROTO_NODELISTREQ == buf[0] && + case PICA_PROTO_NEWNODE_IPV4: + if ( PICA_PROTO_NODELISTREQ == buf[0] && ((struct PICA_nodeaddr_ipv4*)nlp->node_addr)->addr == ((struct PICA_nodeaddr_ipv4*)n->node_addr)->addr && ((struct PICA_nodeaddr_ipv4*)nlp->node_addr)->port == ((struct PICA_nodeaddr_ipv4*)n->node_addr)->port ) - break;//exclude requester's address - + break;//exclude requester's address + nl_buf[nl_size] = PICA_PROTO_NEWNODE_IPV4; *((in_addr_t*)(nl_buf + nl_size + 1)) = ((struct PICA_nodeaddr_ipv4*)nlp->node_addr)->addr; *((in_port_t*)(nl_buf + nl_size + 5)) = ((struct PICA_nodeaddr_ipv4*)nlp->node_addr)->port; - nl_size += PICA_PROTO_NODELIST_ITEM_IPV4_SIZE;//CONF - break; + nl_size += PICA_PROTO_NODELIST_ITEM_IPV4_SIZE;//CONF + break; } -//#warning "set limit on list size, <65532 bytes!!!" - nlp = nlp->next; +//#warning "set limit on list size, <65532 bytes!!!" + nlp = nlp->next; } switch(buf[0]) { case PICA_PROTO_CLNODELISTREQ: mp = client_wbuf_push( c, PICA_PROTO_CLNODELIST, nl_size + 4); - break; + break; case PICA_PROTO_NODELISTREQ: mp = nodelink_wbuf_push( n, PICA_PROTO_NODELIST, nl_size + 4); - break; + break; } if (mp) @@ -773,17 +773,17 @@ unsigned int procmsg_NODELIST(unsigned char* buf, unsigned int size, void* ptr) nodelink_attach_nodeaddr(n, na_ipv4.magick, &na_ipv4, sizeof(struct PICA_nodeaddr_ipv4)); listleft -= PICA_PROTO_NODELIST_ITEM_IPV4_SIZE; - break; + break; } - continue; + continue; } - else + else { - struct PICA_nodeaddr na; - //char addr[256]; - struct newconn nc; - struct nodelink *nlp; - int skip_save = 0; + struct PICA_nodeaddr na; + //char addr[256]; + struct newconn nc; + struct nodelink *nlp; + int skip_save = 0; memset(na.addr, 0, 256); memset(&nc, 0, sizeof(struct newconn)); @@ -796,9 +796,9 @@ unsigned int procmsg_NODELIST(unsigned char* buf, unsigned int size, void* ptr) na_ipv4.port = *(in_port_t*)(buf + size - listleft + 5); sprintf(na.addr, "%.16s", inet_ntoa(*(struct in_addr*)&na_ipv4.addr)); - na.port = ntohs(na_ipv4.port); - - //nodewait_start_connection(&na); + na.port = ntohs(na_ipv4.port); + + //nodewait_start_connection(&na); // if (try_connect_to_node(na.addr,ntohs(na_ipv4.port),&nc)) // if (try_get_reply(&nc)) // { @@ -807,21 +807,21 @@ unsigned int procmsg_NODELIST(unsigned char* buf, unsigned int size, void* ptr) // nodelink_attach_nodeaddr(nlp,na_ipv4.magick,&na_ipv4,sizeof(struct PICA_nodeaddr_ipv4)); // PICA_debug1("LINKED NODE:%s\n",inet_ntoa(*(struct in_addr*)&na_ipv4.addr)); // } - - PICA_debug3("NODELIST item %.16s:%hu", inet_ntoa(*(struct in_addr*)&na_ipv4.addr), ntohs(na_ipv4.port)); - - if (nodecfg.disable_reserved_addrs && PICA_is_reserved_addr_ipv4(na_ipv4.addr)) - { - skip_save = 1; - PICA_debug1("Received NODELIST item %.16s:%hu is in private range, skipping", - inet_ntoa(*(struct in_addr*)&na_ipv4.addr), ntohs(na_ipv4.port) - ); - } + + PICA_debug3("NODELIST item %.16s:%hu", inet_ntoa(*(struct in_addr*)&na_ipv4.addr), ntohs(na_ipv4.port)); + + if (nodecfg.disable_reserved_addrs && PICA_is_reserved_addr_ipv4(na_ipv4.addr)) + { + skip_save = 1; + PICA_debug1("Received NODELIST item %.16s:%hu is in private range, skipping", + inet_ntoa(*(struct in_addr*)&na_ipv4.addr), ntohs(na_ipv4.port) + ); + } listleft -= PICA_PROTO_NODELIST_ITEM_IPV4_SIZE; - break; + break; } - if (!skip_save) - PICA_nodeaddr_save(nodecfg.nodes_db_file, &na);//CONF filename + if (!skip_save) + PICA_nodeaddr_save(nodecfg.nodes_db_file, &na);//CONF filename } } @@ -842,10 +842,10 @@ unsigned int procmsg_N2NFOUND(unsigned char* buf, unsigned int size, void* ptr) cclink_attach_remotecle_node(cc, n); if((mp = nodelink_wbuf_push(n, PICA_PROTO_N2NCONNREQOUTG, PICA_PROTO_N2NCONNREQOUTG_SIZE))) { - memcpy(mp->tail, cc->caller_id, PICA_ID_SIZE); - memcpy(mp->tail + PICA_ID_SIZE, callee_id, PICA_ID_SIZE); - - } + memcpy(mp->tail, cc->caller_id, PICA_ID_SIZE); + memcpy(mp->tail + PICA_ID_SIZE, callee_id, PICA_ID_SIZE); + + } } return 1; } @@ -863,7 +863,7 @@ unsigned int procmsg_SEARCH(unsigned char* buf, unsigned int size, void* ptr) { if ((mp = nodelink_wbuf_push(n, PICA_PROTO_N2NFOUND, PICA_PROTO_N2NFOUND_SIZE))) { - memcpy(mp->tail, callee_id, PICA_ID_SIZE); + memcpy(mp->tail, callee_id, PICA_ID_SIZE); } } return 1; @@ -885,16 +885,16 @@ unsigned int procmsg_N2NCONNREQOUTG(unsigned char* buf, unsigned int size, void* { if ((mp = client_wbuf_push(callee, PICA_PROTO_CONNREQINC, PICA_PROTO_CONNREQINC_SIZE))) { - memcpy(mp->tail, caller_id, PICA_ID_SIZE); - cclink_list_addn2ncle(caller_id, n, callee); + memcpy(mp->tail, caller_id, PICA_ID_SIZE); + cclink_list_addn2ncle(caller_id, n, callee); } } else { if ((mp = nodelink_wbuf_push(n, PICA_PROTO_N2NNOTFOUND, PICA_PROTO_N2NNOTFOUND_SIZE))) { - memcpy(mp->tail, caller_id, PICA_ID_SIZE); - memcpy(mp->tail + PICA_ID_SIZE, callee_id, PICA_ID_SIZE); + memcpy(mp->tail, caller_id, PICA_ID_SIZE); + memcpy(mp->tail + PICA_ID_SIZE, callee_id, PICA_ID_SIZE); } } return 1; @@ -918,8 +918,8 @@ unsigned int procmsg_N2NALLOW(unsigned char* buf, unsigned int size, void* ptr) { if ((mp = client_wbuf_push(cc->p1, PICA_PROTO_FOUND, PICA_PROTO_FOUND_SIZE))) { - memcpy(mp->tail, callee_id, PICA_ID_SIZE); - cclink_setwaitconn(cc); + memcpy(mp->tail, callee_id, PICA_ID_SIZE); + cclink_setwaitconn(cc); } } return 1; @@ -943,9 +943,9 @@ unsigned int procmsg_N2NNOTFOUND(unsigned char* buf, unsigned int size, void* pt { if ((mp = client_wbuf_push(cc->p1, PICA_PROTO_NOTFOUND, PICA_PROTO_NOTFOUND_SIZE))) { - memcpy(mp->tail, callee_id, PICA_ID_SIZE); + memcpy(mp->tail, callee_id, PICA_ID_SIZE); } - cclink_list_delete(cc); + cclink_list_delete(cc); } return 1; @@ -966,7 +966,7 @@ unsigned int procmsg_N2NMSG(unsigned char* buf, unsigned int size, void* ptr) receiver_id = buf + 4 + PICA_ID_SIZE; if (len < 2 * PICA_ID_SIZE) - return 0; + return 0; datalen = len - 2 * PICA_ID_SIZE; @@ -974,36 +974,36 @@ unsigned int procmsg_N2NMSG(unsigned char* buf, unsigned int size, void* ptr) if (cc && cc->state == PICA_CCLINK_N2NCLE_ACTIVE) { - if (datalen + cc->bufpos_p1p2 > cc->buflen_p1p2) + if (datalen + cc->bufpos_p1p2 > cc->buflen_p1p2) { - cclink_list_delete(cc);//CLOSING CCLINK DUE TO BUFER OVERRUN --------- FIXME FIX FIX FIX - return 1; + cclink_list_delete(cc);//CLOSING CCLINK DUE TO BUFER OVERRUN --------- FIXME FIX FIX FIX + return 1; } - memcpy(cc->buf_p1p2 + cc->bufpos_p1p2, buf + 4 + 2 * PICA_ID_SIZE, datalen); - cc->bufpos_p1p2 += datalen; - return 1; + memcpy(cc->buf_p1p2 + cc->bufpos_p1p2, buf + 4 + 2 * PICA_ID_SIZE, datalen); + cc->bufpos_p1p2 += datalen; + return 1; } /////////////// cc = cclink_list_search(receiver_id, sender_id); if (cc && cc->state == PICA_CCLINK_N2NCLR_ACTIVE) { - if (datalen + cc->bufpos_p2p1 > cc->buflen_p2p1) + if (datalen + cc->bufpos_p2p1 > cc->buflen_p2p1) { - cclink_list_delete(cc);//CLOSING CCLINK DUE TO BUFER OVERRUN --------- FIXME FIX FIX FIX - return 1; + cclink_list_delete(cc);//CLOSING CCLINK DUE TO BUFER OVERRUN --------- FIXME FIX FIX FIX + return 1; } memcpy(cc->buf_p2p1 + cc->bufpos_p2p1, buf + 4 + 2 * PICA_ID_SIZE, datalen); - cc->bufpos_p2p1 += datalen; - return 1; + cc->bufpos_p2p1 += datalen; + return 1; } if ((mp = nodelink_wbuf_push(n, PICA_PROTO_N2NNOTFOUND, PICA_PROTO_N2NNOTFOUND_SIZE))) { - memcpy(mp->tail, sender_id, PICA_ID_SIZE); - memcpy(mp->tail + PICA_ID_SIZE, receiver_id, PICA_ID_SIZE); + memcpy(mp->tail, sender_id, PICA_ID_SIZE); + memcpy(mp->tail + PICA_ID_SIZE, receiver_id, PICA_ID_SIZE); } return 1; @@ -1016,9 +1016,9 @@ struct cclink* cclink_list_findwaitsearch(const unsigned char *callee_id) c = cclink_list_head; while(c) { - if (memcmp(c->callee_id, callee_id, PICA_ID_SIZE) == 0 + if (memcmp(c->callee_id, callee_id, PICA_ID_SIZE) == 0 && c->state == PICA_CCLINK_N2NCLR_WAITSEARCH) - return c; + return c; c = c->next; } return 0; @@ -1031,18 +1031,18 @@ struct cclink* cclink_list_search(const unsigned char *caller_id, const unsigned while(c) { - if (memcmp(c->caller_id, caller_id, PICA_ID_SIZE) == 0 - && memcmp(c->callee_id, callee_id, PICA_ID_SIZE) == 0) - return c; + if (memcmp(c->caller_id, caller_id, PICA_ID_SIZE) == 0 + && memcmp(c->callee_id, callee_id, PICA_ID_SIZE) == 0) + return c; c = c->next; } return 0; } -void cclink_list_delete(struct cclink *l) +void cclink_list_delete(struct cclink *l) { PICA_debug1("cclink_list_delete(%p)", (void*)l); -//удаление из глобального списка +//удаление из глобального списка if (l->prev) l->prev->next = l->next; else @@ -1055,33 +1055,33 @@ void cclink_list_delete(struct cclink *l) if (l->p1) { - if (l->sck_p1) + if (l->sck_p1) { - SHUTDOWN(l->sck_p1); - CLOSE(l->sck_p1); - PICA_debug2("closed socket %i", l->sck_p1); + SHUTDOWN(l->sck_p1); + CLOSE(l->sck_p1); + PICA_debug2("closed socket %i", l->sck_p1); } }//caller_id is stored in p1 structure else - free(l->caller_id);//caller_id was allocated by malloc + free(l->caller_id);//caller_id was allocated by malloc if (l->p2) { - if (l->sck_p2) + if (l->sck_p2) { - SHUTDOWN(l->sck_p2); - CLOSE(l->sck_p2); - PICA_debug2("closed socket %i", l->sck_p2); + SHUTDOWN(l->sck_p2); + CLOSE(l->sck_p2); + PICA_debug2("closed socket %i", l->sck_p2); } } else - free(l->callee_id); + free(l->callee_id); if (l->buf_p1p2) - free(l->buf_p1p2); + free(l->buf_p1p2); if (l->buf_p2p1) - free(l->buf_p2p1); + free(l->buf_p2p1); free(l); cclink_list_count--; @@ -1094,15 +1094,15 @@ void cclink_list_delete_by_client(struct client *cl) while(l) { - if (l->p1 == cl || l->p2 == cl) - kill_ptr = l; - - l = l->next; + if (l->p1 == cl || l->p2 == cl) + kill_ptr = l; + + l = l->next; - if (kill_ptr) + if (kill_ptr) { - cclink_list_delete(kill_ptr); - kill_ptr = 0; + cclink_list_delete(kill_ptr); + kill_ptr = 0; } } @@ -1116,15 +1116,15 @@ void cclink_list_delete_by_nodelink(struct nodelink *node) while(l) { - if (l->caller_node == node || l->callee_node == node) - kill_ptr = l; - - l = l->next; + if (l->caller_node == node || l->callee_node == node) + kill_ptr = l; + + l = l->next; - if (kill_ptr) + if (kill_ptr) { - cclink_list_delete(kill_ptr); - kill_ptr = 0; + cclink_list_delete(kill_ptr); + kill_ptr = 0; } } } @@ -1140,7 +1140,7 @@ struct cclink* cclink_list_add(struct client *clr, struct client *cle) l = (struct cclink*)calloc(sizeof(struct cclink), 1); if (!l) - return 0; + return 0; //l->state=PICA_LINKSTATE_WAITREP; @@ -1178,8 +1178,8 @@ void cclink_list_addlocal(struct client *clr, struct client *cle) if (l) { l->state = PICA_CCLINK_LOCAL_WAITREP; - l->caller_id = l->p1->id; - l->callee_id = l->p2->id; + l->caller_id = l->p1->id; + l->callee_id = l->p2->id; } } @@ -1193,13 +1193,13 @@ void cclink_list_addn2nclr(struct client *clr, const unsigned char *callee_id) if (l) { l->state = PICA_CCLINK_N2NCLR_WAITSEARCH; - l->caller_id = l->p1->id; - l->callee_id = (unsigned char*)malloc(PICA_ID_SIZE); + l->caller_id = l->p1->id; + l->callee_id = (unsigned char*)malloc(PICA_ID_SIZE); - if (l->callee_id == NULL) - PICA_fatal("memory allocation failed"); + if (l->callee_id == NULL) + PICA_fatal("memory allocation failed"); - memcpy(l->callee_id, callee_id, PICA_ID_SIZE); + memcpy(l->callee_id, callee_id, PICA_ID_SIZE); } } @@ -1221,14 +1221,14 @@ void cclink_list_addn2ncle(const unsigned char *caller_id, struct nodelink *call if (l) { l->state = PICA_CCLINK_N2NCLE_WAITREP; - l->caller_id = (unsigned char*)malloc(PICA_ID_SIZE); + l->caller_id = (unsigned char*)malloc(PICA_ID_SIZE); - if (l->caller_id == NULL) - PICA_fatal("memory allocation failed"); + if (l->caller_id == NULL) + PICA_fatal("memory allocation failed"); - memcpy(l->caller_id, caller_id, PICA_ID_SIZE); - l->callee_id = l->p2->id; - l->caller_node = caller_node; + memcpy(l->caller_id, caller_id, PICA_ID_SIZE); + l->callee_id = l->p2->id; + l->caller_node = caller_node; } } @@ -1239,16 +1239,16 @@ void cclink_setwaitconn(struct cclink *ccl) { case PICA_CCLINK_LOCAL_WAITREP: ccl->state = PICA_CCLINK_LOCAL_WAITCONNCLE; - // - break; + // + break; case PICA_CCLINK_N2NCLR_WAITREP: ccl->state = PICA_CCLINK_N2NCLR_WAITCONNCLR; - break; + break; case PICA_CCLINK_N2NCLE_WAITREP: ccl->state = PICA_CCLINK_N2NCLE_WAITCONNCLE; - break; + break; default: - ; + ; } } @@ -1258,11 +1258,11 @@ int cclink_allocbufs(struct cclink *ccl) ccl->buf_p2p1 = malloc(DEFAULT_BUF_SIZE); if (!ccl->buf_p1p2 || !ccl->buf_p2p1) { - if (ccl->buf_p1p2) - free(ccl->buf_p1p2); - if (ccl->buf_p2p1) - free(ccl->buf_p2p1); - return 0; + if (ccl->buf_p1p2) + free(ccl->buf_p1p2); + if (ccl->buf_p2p1) + free(ccl->buf_p2p1); + return 0; } ccl->buflen_p1p2 = DEFAULT_BUF_SIZE; ccl->buflen_p2p1 = DEFAULT_BUF_SIZE; @@ -1274,36 +1274,36 @@ void cclink_activate(struct cclink *ccl, SOCKET s) switch(ccl->state) { case PICA_CCLINK_LOCAL_WAITCONNCLE: - ccl->sck_p2 = s; - ccl->state = PICA_CCLINK_LOCAL_WAITCONNCLR; - break; + ccl->sck_p2 = s; + ccl->state = PICA_CCLINK_LOCAL_WAITCONNCLR; + break; case PICA_CCLINK_LOCAL_WAITCONNCLR: - ccl->sck_p1 = s; - if (!cclink_allocbufs(ccl)) + ccl->sck_p1 = s; + if (!cclink_allocbufs(ccl)) { - cclink_list_delete(ccl); - return; + cclink_list_delete(ccl); + return; } - ccl->state = PICA_CCLINK_LOCAL_ACTIVE; - break; + ccl->state = PICA_CCLINK_LOCAL_ACTIVE; + break; case PICA_CCLINK_N2NCLR_WAITCONNCLR: - ccl->sck_p1 = s; - if (!cclink_allocbufs(ccl)) + ccl->sck_p1 = s; + if (!cclink_allocbufs(ccl)) { - cclink_list_delete(ccl); - return; + cclink_list_delete(ccl); + return; } - ccl->state = PICA_CCLINK_N2NCLR_ACTIVE; - break; + ccl->state = PICA_CCLINK_N2NCLR_ACTIVE; + break; case PICA_CCLINK_N2NCLE_WAITCONNCLE: - ccl->sck_p2 = s; - if (!cclink_allocbufs(ccl)) + ccl->sck_p2 = s; + if (!cclink_allocbufs(ccl)) { - cclink_list_delete(ccl); - return; + cclink_list_delete(ccl); + return; } - ccl->state = PICA_CCLINK_N2NCLE_ACTIVE; - break; + ccl->state = PICA_CCLINK_N2NCLE_ACTIVE; + break; } } @@ -1327,12 +1327,12 @@ int PICA_node_init() listen_comm_sck = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (listen_comm_sck == -1) - PICA_fatal("unable to get socket - %s", strerror(errno)); + PICA_fatal("unable to get socket - %s", strerror(errno)); flag = 1; //enable SO_REUSEADDR if (0 != setsockopt(listen_comm_sck, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag))) { - PICA_error("failed to set SO_REUSEADDR on socket: %s", strerror(errno)); + PICA_error("failed to set SO_REUSEADDR on socket: %s", strerror(errno)); } memset(&sd, 0, sizeof(sd)); @@ -1344,12 +1344,12 @@ int PICA_node_init() ret = bind(listen_comm_sck, (struct sockaddr*)&sd, sizeof(sd)); if (ret == -1) - PICA_fatal("unable to bind socket - %s", strerror(errno)); + PICA_fatal("unable to bind socket - %s", strerror(errno)); ret = listen(listen_comm_sck, 20); if (ret == -1) - PICA_fatal("unable to listen socket - %s", strerror(errno)); + PICA_fatal("unable to listen socket - %s", strerror(errno)); { int ret_comm; @@ -1364,23 +1364,23 @@ int PICA_node_init() // ret_data=ioctl(listen_node_sck,FIONBIO,(int*)&arg); #endif if (ret_comm == -1) - PICA_fatal("unable to set non-blocking mode on socket - %s", strerror(errno)); + PICA_fatal("unable to set non-blocking mode on socket - %s", strerror(errno)); } -//#ifdef NO_RAND_DEV +//#ifdef NO_RAND_DEV //PICA_rand_seed(); //#endif ctx = SSL_CTX_new(TLSv1_2_method()); if (!ctx) - PICA_fatal("unable to create SSL_CTX object"); + PICA_fatal("unable to create SSL_CTX object"); ret = SSL_CTX_load_verify_locations(ctx, nodecfg.CA_cert_file, 0); if (!ret) - PICA_fatal("call to SSL_CTX_load_verify_locations failed(). Check if %s exists and is accesible", nodecfg.CA_cert_file); + PICA_fatal("call to SSL_CTX_load_verify_locations failed(). Check if %s exists and is accesible", nodecfg.CA_cert_file); SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, verify_callback); @@ -1436,7 +1436,7 @@ struct newconn* newconn_add(struct newconn *ncs, int *pos) int min_pos = 0; if (*pos < MAX_NEWCONNS && !ncs[*pos].sck) { - goto ret; + goto ret; } else { @@ -1449,15 +1449,15 @@ struct newconn* newconn_add(struct newconn *ncs, int *pos) min = ncs[*pos].tmst; min_pos = *pos; } - (*pos)++; + (*pos)++; } if ( (*pos) == MAX_NEWCONNS) { *pos = min_pos; - SHUTDOWN(ncs[min_pos].sck); - CLOSE(ncs[min_pos].sck); - PICA_debug2("closed socket %i", ncs[min_pos].sck); + SHUTDOWN(ncs[min_pos].sck); + CLOSE(ncs[min_pos].sck); + PICA_debug2("closed socket %i", ncs[min_pos].sck); } } @@ -1479,40 +1479,40 @@ int client_tree_add(struct client *ci) if (client_tree_root) { i = client_tree_root; - - do + + do { int cmp; cmp = memcmp(ci->id, i->id, PICA_ID_SIZE); if (cmp == 0) - return 0; + return 0; if (cmp < 0) // ci->id < i->id { - if (i->left) + if (i->left) i = i->left; - else + else { i->left = ci; ci->up = i; - return 1; + return 1; } } - else + else { - if (i->right) + if (i->right) i = i->right; - else + else { i->right = ci; ci->up = i; - return 1; + return 1; } } } - while(1); + while(1); } else client_tree_root = ci; @@ -1532,11 +1532,11 @@ struct client* client_tree_search(const unsigned char *id) int cmp = memcmp(id, i_ptr->id, PICA_ID_SIZE); if (cmp == 0) - return i_ptr; + return i_ptr; if (cmp < 0) //id < i_ptr->id i_ptr = i_ptr->left; - else + else i_ptr = i_ptr->right; } @@ -1548,65 +1548,65 @@ void client_tree_print(struct client *c) { if (!c) { - puts("NULL"); - return; + puts("NULL"); + return; } printf("%p: %u LEFT: %p, RIGHT: %p\n", (void*)c, c->id, (void*)c->left, (void*)c->right); if (c->left) - client_tree_print(c->left); + client_tree_print(c->left); if (c->right) - client_tree_print(c->right); + client_tree_print(c->right); } -//удаление структуры из дерева +//удаление структуры из дерева void client_tree_remove(struct client* ci) { struct client** p_link;//указывает на left или right в родительском узле if (!ci->up) { - p_link = &client_tree_root; + p_link = &client_tree_root; } else { if (ci == ci->up->left) p_link = &(ci->up->left); - else + else p_link = &(ci->up->right); } - - + + if (!ci->left && !ci->right) { *p_link = 0; - return; + return; } if (ci->left && !ci->right) { ci->left->up = ci->up; *p_link = ci->left; - return; + return; } if (!ci->left && ci->right) { ci->right->up = ci->up; *p_link = ci->right; - return; + return; } { - struct client *lm; + struct client *lm; lm = ci->right; while(lm->left) lm = lm->left; //поиск самого левого узла правого поддерева if (lm != ci->right) - { + { lm->up->left = lm->right; lm->right = ci->right; } @@ -1628,8 +1628,8 @@ struct client *client_list_addnew(struct newconn *nc) if (!ci->ssl_comm) { - free(ci); - return 0; + free(ci); + return 0; } if (client_list_end) @@ -1653,8 +1653,8 @@ struct client *client_list_addnew(struct newconn *nc) ci->r_buf = calloc(1, DEFAULT_BUF_SIZE); if (!ci->r_buf) { - free(ci); - return 0; + free(ci); + return 0; } ci->buflen_r = DEFAULT_BUF_SIZE; @@ -1681,17 +1681,17 @@ void client_list_delete(struct client* ci) //удаление из дерева if (client_tree_search(ci->id) == ci) { - client_tree_remove(ci); - client_tree_print(client_tree_root); + client_tree_remove(ci); + client_tree_print(client_tree_root); } cclink_list_delete_by_client(ci); if (ci->r_buf) - free(ci->r_buf); + free(ci->r_buf); if (ci->w_buf) - free(ci->w_buf); + free(ci->w_buf); CLOSE(ci->sck_comm); PICA_debug2("closed socket %i", ci->sck_comm); @@ -1705,28 +1705,28 @@ struct PICA_proto_msg* client_wbuf_push if (!c->w_buf) { c->w_buf = calloc(1, DEFAULT_BUF_SIZE + (size / DEFAULT_BUF_SIZE) * DEFAULT_BUF_SIZE ); - if (!c->w_buf) + if (!c->w_buf) { - PICA_error("calloc() failed. Out of memory"); - return 0; + PICA_error("calloc() failed. Out of memory"); + return 0; } c->buflen_w = DEFAULT_BUF_SIZE + (size / DEFAULT_BUF_SIZE) * DEFAULT_BUF_SIZE; } if ((c->buflen_w - c->w_pos) < size) { - unsigned char *p; + unsigned char *p; p = realloc(c->w_buf, size + c->w_pos); - if (p) + if (p) { c->w_buf = p; c->buflen_w = size + c->w_pos; } - else - return 0; + else + return 0; } - + struct PICA_proto_msg *mp = (struct PICA_proto_msg *)(c->w_buf + c->w_pos); mp->head[0] = mp->head[1] = msgid; c->w_pos += size; @@ -1741,8 +1741,8 @@ int client_rbuf_grow(struct client *c) if (!p) { - PICA_error("realloc() failed"); - return 0; + PICA_error("realloc() failed"); + return 0; } c->r_buf = p; c->buflen_r += DEFAULT_BUF_SIZE; @@ -1757,7 +1757,7 @@ struct nodelink *nodelink_list_addnew(struct newconn *nc) nl = (struct nodelink*)calloc(1, sizeof(struct nodelink)); if (!nl) - return 0; + return 0; if (nodelink_list_end) { @@ -1777,8 +1777,8 @@ struct nodelink *nodelink_list_addnew(struct newconn *nc) nl->r_buf = calloc(1, DEFAULT_BUF_SIZE); if (!nl->r_buf) { - free(nl); - return 0; + free(nl); + return 0; } nl->buflen_r = DEFAULT_BUF_SIZE; @@ -1791,15 +1791,15 @@ struct nodelink *nodelink_list_addnew(struct newconn *nc) void nodelink_list_delete(struct nodelink *n) { PICA_debug1("nodelink_list_delete(%p)", (void*)n); - + if (n->r_buf) - free(n->r_buf); + free(n->r_buf); if (n->w_buf) - free(n->w_buf); + free(n->w_buf); if (n->node_addr) - free(n->node_addr); + free(n->node_addr); CLOSE(n->sck); PICA_debug2("closed socket %i", n->sck); @@ -1824,16 +1824,16 @@ int nodelink_attach_nodeaddr(struct nodelink *nl, unsigned int addr_type, void* { if (nl && nodeaddr) { - if (nl->node_addr) - free(nl->node_addr); - + if (nl->node_addr) + free(nl->node_addr); + nl->node_addr = malloc(nodeaddr_size); - if (!nl->node_addr) - return 0;//ERR_CHECK + if (!nl->node_addr) + return 0;//ERR_CHECK memcpy(nl->node_addr, nodeaddr, nodeaddr_size); nl->addr_type = addr_type; - return 1; + return 1; } return 0; } @@ -1846,8 +1846,8 @@ int nodelink_rbuf_grow(struct nodelink *nl) if (!p) { - PICA_error("realloc() failed"); - return 0; + PICA_error("realloc() failed"); + return 0; } nl->r_buf = p; nl->buflen_r += DEFAULT_BUF_SIZE; @@ -1859,32 +1859,32 @@ struct PICA_proto_msg* nodelink_wbuf_push (struct nodelink *nl, unsigned int msgid, unsigned int size) { struct PICA_proto_msg *mp; - + if (!nl->w_buf) { nl->w_buf = calloc(1, DEFAULT_BUF_SIZE ); - if (!nl->w_buf) + if (!nl->w_buf) { - PICA_error("calloc() failed. Out of memory"); - return 0; + PICA_error("calloc() failed. Out of memory"); + return 0; } nl->buflen_w = DEFAULT_BUF_SIZE; } if ((nl->buflen_w - nl->w_pos) < size) { - unsigned char *p; + unsigned char *p; p = realloc(nl->w_buf, size + nl->w_pos); - if (p) + if (p) { nl->w_buf = p; nl->buflen_w = size + nl->w_pos; } - else - return 0; + else + return 0; } - + mp = (struct PICA_proto_msg *)(nl->w_buf + nl->w_pos); mp->head[0] = mp->head[1] = msgid; nl->w_pos += size; @@ -1898,15 +1898,15 @@ struct nodelink *nodelink_search_by_ipv4addr(in_addr_t ip, in_port_t port) nl = nodelink_list_head; while(nl && !( - (nl->addr.sin_addr.s_addr == ip && nl->addr.sin_port == port) || - (nl->node_addr && nl->addr_type == PICA_PROTO_NEWNODE_IPV4 && - ((struct PICA_nodeaddr_ipv4*)nl->node_addr) ->addr == ip && - ((struct PICA_nodeaddr_ipv4*)nl->node_addr) ->port == port - ) - ) - ) + (nl->addr.sin_addr.s_addr == ip && nl->addr.sin_port == port) || + (nl->node_addr && nl->addr_type == PICA_PROTO_NEWNODE_IPV4 && + ((struct PICA_nodeaddr_ipv4*)nl->node_addr) ->addr == ip && + ((struct PICA_nodeaddr_ipv4*)nl->node_addr) ->port == port + ) + ) + ) { - nl = nl->next; + nl = nl->next; } return nl; @@ -1923,7 +1923,7 @@ void process_timeouts_newconn() for (i = 0; i < MAX_NEWCONNS; i++) { - if (newconns[i].sck) + if (newconns[i].sck) { if (newconns[i].tmst < t) { @@ -1948,23 +1948,23 @@ void process_timeouts_c2c() while(il) { - switch(il->state) + switch(il->state) { - case PICA_CCLINK_LOCAL_ACTIVE: + case PICA_CCLINK_LOCAL_ACTIVE: case PICA_CCLINK_N2NCLR_ACTIVE: case PICA_CCLINK_N2NCLE_ACTIVE: - //idle timeout (>=60sec), update timestamp at process_c2c + //idle timeout (>=60sec), update timestamp at process_c2c - break; + break; default: if ((time(0) - il->tmst) > TMO_CCLINK_WAITACTIVE) { - struct cclink *dl; + struct cclink *dl; dl = il; il = il->next; - cclink_list_delete(dl); - continue; + cclink_list_delete(dl); + continue; } } il = il->next; @@ -1983,48 +1983,48 @@ void process_timeouts_c2n() while(i_ptr) { - if (i_ptr->disconnect_ticking) + if (i_ptr->disconnect_ticking) { - if (cur_time >= i_ptr->tmst) + if (cur_time >= i_ptr->tmst) { - if ((cur_time - i_ptr->tmst) > NOREPLY_TIMEOUT) - kill_ptr = i_ptr; + if ((cur_time - i_ptr->tmst) > NOREPLY_TIMEOUT) + kill_ptr = i_ptr; } - else + else { //2038 year has come, and this code is still working somewhere with 32bit Unix timestamps :) - if ((i_ptr->tmst - cur_time ) > NOREPLY_TIMEOUT) - kill_ptr = i_ptr; + if ((i_ptr->tmst - cur_time ) > NOREPLY_TIMEOUT) + kill_ptr = i_ptr; } } - else + else { - if (cur_time >= i_ptr->tmst) + if (cur_time >= i_ptr->tmst) { - if ((cur_time - i_ptr->tmst) > KEEPALIVE_TIMEOUT) + if ((cur_time - i_ptr->tmst) > KEEPALIVE_TIMEOUT) { - struct PICA_proto_msg *mp; - - if ((mp = client_wbuf_push(i_ptr, PICA_PROTO_PINGREQ, PICA_PROTO_PINGREQ_SIZE))) + struct PICA_proto_msg *mp; + + if ((mp = client_wbuf_push(i_ptr, PICA_PROTO_PINGREQ, PICA_PROTO_PINGREQ_SIZE))) { - PICA_debug3("sending PINGREQ to %p", i_ptr); + PICA_debug3("sending PINGREQ to %p", i_ptr); RAND_pseudo_bytes(mp->tail, 2); - - i_ptr->tmst = time(0); - i_ptr->disconnect_ticking = 1; + + i_ptr->tmst = time(0); + i_ptr->disconnect_ticking = 1; } - else - kill_ptr = i_ptr; + else + kill_ptr = i_ptr; } } } - - i_ptr = i_ptr->next; - if (kill_ptr) + i_ptr = i_ptr->next; + + if (kill_ptr) { - PICA_info("Disconnecting user %u due to noreply timeout", kill_ptr -> id); - client_list_delete(kill_ptr); + PICA_info("Disconnecting user %u due to noreply timeout", kill_ptr -> id); + client_list_delete(kill_ptr); kill_ptr = 0; } } @@ -2042,48 +2042,48 @@ void process_timeouts_n2n() while(i_ptr) { - if (i_ptr->disconnect_ticking) + if (i_ptr->disconnect_ticking) { - if (cur_time >= i_ptr->tmst) + if (cur_time >= i_ptr->tmst) { - if ((cur_time - i_ptr->tmst) > NOREPLY_TIMEOUT) - kill_ptr = i_ptr; + if ((cur_time - i_ptr->tmst) > NOREPLY_TIMEOUT) + kill_ptr = i_ptr; } - else + else { //2038 year has come, and this code is still working somewhere with 32bit Unix timestamps :) - if ((i_ptr->tmst - cur_time ) > NOREPLY_TIMEOUT) - kill_ptr = i_ptr; + if ((i_ptr->tmst - cur_time ) > NOREPLY_TIMEOUT) + kill_ptr = i_ptr; } } - else + else { - if (cur_time >= i_ptr->tmst) + if (cur_time >= i_ptr->tmst) { - if ((cur_time - i_ptr->tmst) > KEEPALIVE_TIMEOUT) + if ((cur_time - i_ptr->tmst) > KEEPALIVE_TIMEOUT) { - struct PICA_proto_msg *mp; - - if ((mp = nodelink_wbuf_push(i_ptr, PICA_PROTO_PINGREQ, PICA_PROTO_PINGREQ_SIZE))) + struct PICA_proto_msg *mp; + + if ((mp = nodelink_wbuf_push(i_ptr, PICA_PROTO_PINGREQ, PICA_PROTO_PINGREQ_SIZE))) { - PICA_debug3("sending PINGREQ to node %p", i_ptr); + PICA_debug3("sending PINGREQ to node %p", i_ptr); RAND_pseudo_bytes(mp->tail, 2); - - i_ptr->tmst = time(0); - i_ptr->disconnect_ticking = 1; + + i_ptr->tmst = time(0); + i_ptr->disconnect_ticking = 1; } - else - kill_ptr = i_ptr; + else + kill_ptr = i_ptr; } } } - - i_ptr = i_ptr->next; - if (kill_ptr) + i_ptr = i_ptr->next; + + if (kill_ptr) { - PICA_info("Disconnecting node %p due to noreply timeout", kill_ptr); - nodelink_list_delete(kill_ptr); + PICA_info("Disconnecting node %p due to noreply timeout", kill_ptr); + nodelink_list_delete(kill_ptr); kill_ptr = 0; } } @@ -2098,8 +2098,8 @@ int process_timeouts() if (time(0) - skynet_refresh_tmst > SKYNET_REFRESH_TIMEOUT && !nodewait_list) { - PICA_debug3("refreshing nodelist database"); - PICA_node_joinskynet(nodecfg.nodes_db_file, nodecfg.announced_addr); + PICA_debug3("refreshing nodelist database"); + PICA_node_joinskynet(nodecfg.nodes_db_file, nodecfg.announced_addr); } return 1; } @@ -2122,7 +2122,7 @@ void newconn_set_fds(fd_set *readfds, int *nfds) int i; for (i = 0; i < MAX_NEWCONNS; i++) - if (newconns[i].sck) + if (newconns[i].sck) set_select_fd(newconns[i].sck, readfds, nfds); } @@ -2148,7 +2148,7 @@ void c2c_set_fds(fd_set *readfds, int *nfds) { if ( !cc->jam_p1p2 && (cc->state == PICA_CCLINK_LOCAL_ACTIVE || cc->state == PICA_CCLINK_N2NCLR_ACTIVE) ) set_select_fd(cc->sck_p1, readfds, nfds); - + if ( !cc->jam_p2p1 && (cc->state == PICA_CCLINK_LOCAL_ACTIVE || cc->state == PICA_CCLINK_N2NCLE_ACTIVE) ) set_select_fd(cc->sck_p2, readfds, nfds); @@ -2178,17 +2178,17 @@ void process_listen_read(fd_set *readfds) { s = accept(listen_comm_sck, (struct sockaddr*)&addr, &addrsize); - if (s >= 0) + if (s >= 0) { nc = newconn_add(newconns, &newconns_pos); - - nc->sck = s; - nc->addr = addr; - PICA_debug1("accepted connection from %.16s, new socket %i", inet_ntoa(addr.sin_addr), s);//IPv6 + + nc->sck = s; + nc->addr = addr; + PICA_debug1("accepted connection from %.16s, new socket %i", inet_ntoa(addr.sin_addr), s);//IPv6 } - else + else { - PICA_error("unable to accept connection: %s", strerror(errno)); + PICA_error("unable to accept connection: %s", strerror(errno)); } } @@ -2206,17 +2206,17 @@ void process_newconn_read(fd_set *readfds) if (ret <= 0) { - //perror("process_newconn_read - recv:");//debug + //perror("process_newconn_read - recv:");//debug newconn_close(newconns + i); - continue; + continue; } newconns[i].pos += ret; - + if(!PICA_processdatastream(newconns[i].buf, &(newconns[i].pos), newconns + i /*arg*/, _msginfo_newconn, MSGINFO_MSGSNUM(_msginfo_newconn) )) { newconn_close(newconns + i); } - //FD_CLR(newconns[i].sck,readfds); + //FD_CLR(newconns[i].sck,readfds); } } @@ -2233,47 +2233,47 @@ void process_c2n_read(fd_set *readfds) while (i_ptr) { if (FD_ISSET(i_ptr->sck_comm, readfds)) - switch(i_ptr->state) - { - case PICA_CLSTATE_CONNECTED: + switch(i_ptr->state) + { + case PICA_CLSTATE_CONNECTED: ret = SSL_read(i_ptr->ssl_comm, i_ptr->r_buf + i_ptr->r_pos, i_ptr->buflen_r - i_ptr->r_pos); - - if (!ret) + + if (!ret) kill_ptr = i_ptr; if (ret < 0) switch(SSL_get_error(i_ptr->ssl_comm, ret)) - { - case SSL_ERROR_WANT_WRITE: - case SSL_ERROR_WANT_READ: - break; - default: + { + case SSL_ERROR_WANT_WRITE: + case SSL_ERROR_WANT_READ: + break; + default: kill_ptr = i_ptr; - } - + } + if (ret > 0) - { + { i_ptr->r_pos += ret; if(!PICA_processdatastream(i_ptr->r_buf, &(i_ptr->r_pos), i_ptr, _msginfo_comm, MSGINFO_MSGSNUM(_msginfo_comm) )) kill_ptr = i_ptr; - - if (i_ptr->buflen_r == i_ptr->r_pos) - if (!client_rbuf_grow(i_ptr)) - kill_ptr = i_ptr; - } - break; - case PICA_CLSTATE_TLSNEGOTIATION: + if (i_ptr->buflen_r == i_ptr->r_pos) + if (!client_rbuf_grow(i_ptr)) + kill_ptr = i_ptr; + + } + break; + case PICA_CLSTATE_TLSNEGOTIATION: i_ptr->w_pos = 1; //???? - //-------------- <<<<<<<<<<<<<<<<<<<<<<<<---------------------------------------- - break; - }; - + //-------------- <<<<<<<<<<<<<<<<<<<<<<<<---------------------------------------- + break; + }; + i_ptr = i_ptr->next; - - if (kill_ptr) + + if (kill_ptr) { - client_list_delete(kill_ptr); + client_list_delete(kill_ptr); kill_ptr = 0; } } @@ -2299,7 +2299,7 @@ void process_c2c_read(fd_set *readfds) { cc->bufpos_p1p2 += ret; } - else + else kill_ptr = cc; } @@ -2312,16 +2312,16 @@ void process_c2c_read(fd_set *readfds) { cc->bufpos_p2p1 += ret; } - else + else kill_ptr = cc; } cc = cc->next; - - if (kill_ptr) + + if (kill_ptr) { - cclink_list_delete(kill_ptr); + cclink_list_delete(kill_ptr); kill_ptr = 0; } } @@ -2340,31 +2340,31 @@ void process_n2n_read(fd_set *readfds) if (FD_ISSET(nl->sck, readfds)) { ret = recv(nl->sck, nl->r_buf + nl->r_pos, nl->buflen_r - nl->r_pos, 0); - + if (ret <= 0) { - if (ret < 0) - PICA_debug3("recv() failed in process_n2n_read(): %s", strerror(errno)); + if (ret < 0) + PICA_debug3("recv() failed in process_n2n_read(): %s", strerror(errno)); kill_ptr = nl; } - else + else { nl->r_pos += ret; - + if(!PICA_processdatastream(nl->r_buf, &(nl->r_pos), nl, _msginfo_node, MSGINFO_MSGSNUM(_msginfo_node) )) kill_ptr = nl; - if (nl->buflen_r == nl->r_pos) - if (!nodelink_rbuf_grow(nl)) + if (nl->buflen_r == nl->r_pos) + if (!nodelink_rbuf_grow(nl)) kill_ptr = nl; } } - + nl = nl->next; - - if (kill_ptr) + + if (kill_ptr) { - nodelink_list_delete(kill_ptr); + nodelink_list_delete(kill_ptr); kill_ptr = 0; } } @@ -2380,27 +2380,27 @@ void process_c2n_write() while(i_ptr) { - //--------- - switch(i_ptr->state) + //--------- + switch(i_ptr->state) { case PICA_CLSTATE_CONNECTED: - if (!i_ptr->w_pos) - break; + if (!i_ptr->w_pos) + break; - if (!i_ptr->btw_ssl) + if (!i_ptr->btw_ssl) i_ptr->btw_ssl = i_ptr->w_pos; - + ret = SSL_write(i_ptr->ssl_comm, i_ptr->w_buf, i_ptr->btw_ssl); - + PICA_debug3("process_c2n_write: ret of SSL_write()=%i", ret); - + if (ret == i_ptr->btw_ssl) { i_ptr->w_pos -= i_ptr->btw_ssl; i_ptr->btw_ssl = 0; } - if (!ret) + if (!ret) kill_ptr = i_ptr; if (ret < 0) @@ -2409,75 +2409,75 @@ void process_c2n_write() if (ret != SSL_ERROR_WANT_WRITE && ret != SSL_ERROR_WANT_READ) kill_ptr = i_ptr; } - break; + break; case PICA_CLSTATE_SENDINGRESP: ret = send(i_ptr->sck_comm, i_ptr->w_buf, i_ptr->w_pos, 0); - if (!ret) + if (!ret) kill_ptr = i_ptr; - + if (ret == SOCKET_ERROR) - ;//ERR_CHECK - - if (ret < i_ptr->w_pos) + ;//ERR_CHECK + + if (ret < i_ptr->w_pos) memmove(i_ptr->w_buf, i_ptr->w_buf + ret, i_ptr->w_pos - ret); //ring buffer is better (??) i_ptr->w_pos -= ret; - - if (!i_ptr->w_pos) + + if (!i_ptr->w_pos) i_ptr->state = PICA_CLSTATE_TLSNEGOTIATION; - - break; + + break; case PICA_CLSTATE_TLSNEGOTIATION: i_ptr->w_pos = 0; ret = SSL_connect(i_ptr->ssl_comm); - + PICA_debug3("process_c2n_write: SSL_connect()=%i", ret); - - if (!ret) + + if (!ret) kill_ptr = i_ptr; - + if (ret < 0) { - int eret; + int eret; eret = SSL_get_error(i_ptr->ssl_comm, ret); - switch(eret) + switch(eret) { case SSL_ERROR_WANT_WRITE: i_ptr->w_pos = 1; - PICA_debug3("SSL_ERROR_WANT_WRITE"); - break; + PICA_debug3("SSL_ERROR_WANT_WRITE"); + break; case SSL_ERROR_WANT_READ: - PICA_debug3("SSL_ERROR_WANT_READ"); - break; + PICA_debug3("SSL_ERROR_WANT_READ"); + break; default: - PICA_debug3("SSL_get_error() = %i", eret); + PICA_debug3("SSL_get_error() = %i", eret); kill_ptr = i_ptr; } } if (ret == 1) - //проверить сертификат пользователя - { - X509* client_cert; + //проверить сертификат пользователя + { + X509* client_cert; - PICA_info("SSL c2n connection established using %s cipher", SSL_get_cipher(i_ptr->ssl_comm)); + PICA_info("SSL c2n connection established using %s cipher", SSL_get_cipher(i_ptr->ssl_comm)); client_cert = SSL_get_peer_certificate (i_ptr->ssl_comm); - if (!client_cert) - { - //ERR_CHECK //нет сертификата + if (!client_cert) + { + //ERR_CHECK //нет сертификата kill_ptr = i_ptr; - } + } - ret = PICA_id_from_X509(client_cert, i_ptr->id); - - if (ret == 0) - { - PICA_error("Unable to get client id from certificate"); + ret = PICA_id_from_X509(client_cert, i_ptr->id); + + if (ret == 0) + { + PICA_error("Unable to get client id from certificate"); kill_ptr = i_ptr; - } - - X509_free(client_cert); + } + + X509_free(client_cert); //reject all-zeroes ID { @@ -2490,32 +2490,32 @@ void process_c2n_write() } if (!kill_ptr && client_tree_search(i_ptr->id)) - { - PICA_info("Disconnecting client %p because other user with same ID = %u is already connected", i_ptr, i_ptr->id); + { + PICA_info("Disconnecting client %p because other user with same ID = %u is already connected", i_ptr, i_ptr->id); memset(i_ptr->id, 0, PICA_ID_SIZE);//reset id to all zeros to prevent removing existing ID from previous connection from client_tree - ret = 0;//id already exists in tree - } - else - { + ret = 0;//id already exists in tree + } + else + { ret = client_tree_add(i_ptr); - client_tree_print(client_tree_root); - } - if (!ret) - { - //ERR_CHECK //не уникальный id + client_tree_print(client_tree_root); + } + if (!ret) + { + //ERR_CHECK //не уникальный id kill_ptr = i_ptr; - } + } i_ptr->state = PICA_CLSTATE_CONNECTED; + } + break; } - break; - } - //--------- + //--------- i_ptr = i_ptr->next; - if (kill_ptr) + if (kill_ptr) { - client_list_delete(kill_ptr); + client_list_delete(kill_ptr); kill_ptr = 0; } } @@ -2531,33 +2531,33 @@ void process_c2c_write() while(cc) { - if (cc->bufpos_p1p2/* && (cc->state==PICA_CCLINK_LOCAL_ACTIVE || cc->state==PICA_CCLINK_N2NCLE_ACTIVE)*/) + if (cc->bufpos_p1p2/* && (cc->state==PICA_CCLINK_LOCAL_ACTIVE || cc->state==PICA_CCLINK_N2NCLE_ACTIVE)*/) { if (cc->state == PICA_CCLINK_N2NCLR_ACTIVE) //receiver is on remote node { - int sendlen; - struct PICA_proto_msg *mp; - - sendlen = (cc->bufpos_p1p2 > PICA_PROTO_N2NMSG_MAXDATASIZE) ? PICA_PROTO_N2NMSG_MAXDATASIZE : cc->bufpos_p1p2; + int sendlen; + struct PICA_proto_msg *mp; + + sendlen = (cc->bufpos_p1p2 > PICA_PROTO_N2NMSG_MAXDATASIZE) ? PICA_PROTO_N2NMSG_MAXDATASIZE : cc->bufpos_p1p2; if(mp = nodelink_wbuf_push(cc->callee_node, PICA_PROTO_N2NMSG, sendlen + 4 + 2 * PICA_ID_SIZE)) { - *((unsigned short*)mp->tail) = 2 * PICA_ID_SIZE + sendlen; - memcpy(mp->tail + 2, cc->caller_id, PICA_ID_SIZE); - memcpy(mp->tail + 2 + PICA_ID_SIZE, cc->callee_id, PICA_ID_SIZE); - memcpy(mp->tail + 2 + 2 * PICA_ID_SIZE, cc->buf_p1p2, sendlen); + *((unsigned short*)mp->tail) = 2 * PICA_ID_SIZE + sendlen; + memcpy(mp->tail + 2, cc->caller_id, PICA_ID_SIZE); + memcpy(mp->tail + 2 + PICA_ID_SIZE, cc->callee_id, PICA_ID_SIZE); + memcpy(mp->tail + 2 + 2 * PICA_ID_SIZE, cc->buf_p1p2, sendlen); ret = sendlen; } - else + else ret = 0; } - else + else ret = send(cc->sck_p2, cc->buf_p1p2, cc->bufpos_p1p2, MSG_NOSIGNAL); PICA_debug3("process_c2c_write: send p1p2: ret=%i", ret); if (ret > 0) { - if (ret < cc->bufpos_p1p2) + if (ret < cc->bufpos_p1p2) memmove(cc->buf_p1p2, cc->buf_p1p2 + ret, cc->bufpos_p1p2 - ret); //may be it's better to implement ring buffer here cc->bufpos_p1p2 -= ret; cc->jam_p1p2 = 0; @@ -2573,7 +2573,7 @@ void process_c2c_write() ret = WSAGetLastError(); if (ret == WSAEWOULDBLOCK || ret == WSAENOBUFS) cc->jam_p1p2 = 1; - else + else { kill_ptr = cc; } @@ -2581,41 +2581,41 @@ void process_c2c_write() ret = errno; if (ret == EAGAIN || ret == ENOBUFS) cc->jam_p1p2 = 1; - else + else { kill_ptr = cc; } #endif } - + } - if (cc->bufpos_p2p1 /*&& (cc->state==PICA_CCLINK_LOCAL_ACTIVE || cc->state==PICA_CCLINK_N2NCLR_ACTIVE)*/) + if (cc->bufpos_p2p1 /*&& (cc->state==PICA_CCLINK_LOCAL_ACTIVE || cc->state==PICA_CCLINK_N2NCLR_ACTIVE)*/) { if (cc->state == PICA_CCLINK_N2NCLE_ACTIVE) //receiver is on remote node { - int sendlen; - struct PICA_proto_msg *mp; - - sendlen = (cc->bufpos_p2p1 > PICA_PROTO_N2NMSG_MAXDATASIZE) ? PICA_PROTO_N2NMSG_MAXDATASIZE : cc->bufpos_p2p1; + int sendlen; + struct PICA_proto_msg *mp; + + sendlen = (cc->bufpos_p2p1 > PICA_PROTO_N2NMSG_MAXDATASIZE) ? PICA_PROTO_N2NMSG_MAXDATASIZE : cc->bufpos_p2p1; if(mp = nodelink_wbuf_push(cc->caller_node, PICA_PROTO_N2NMSG, sendlen + 4 + 2 * PICA_ID_SIZE)) { - *((unsigned short*)mp->tail) = 2 * PICA_ID_SIZE + sendlen; - memcpy(mp->tail + 2, cc->callee_id, PICA_ID_SIZE); - memcpy(mp->tail + 2 + PICA_ID_SIZE, cc->caller_id, PICA_ID_SIZE); + *((unsigned short*)mp->tail) = 2 * PICA_ID_SIZE + sendlen; + memcpy(mp->tail + 2, cc->callee_id, PICA_ID_SIZE); + memcpy(mp->tail + 2 + PICA_ID_SIZE, cc->caller_id, PICA_ID_SIZE); memcpy(mp->tail + 2 + 2 * PICA_ID_SIZE, cc->buf_p2p1, sendlen); ret = sendlen; } - else + else ret = 0; } - else + else ret = send(cc->sck_p1, cc->buf_p2p1, cc->bufpos_p2p1, MSG_NOSIGNAL); PICA_debug3("process_c2c_write: send p2p1: ret=%i", ret); if (ret > 0) { - if (ret < cc->bufpos_p2p1) + if (ret < cc->bufpos_p2p1) memmove(cc->buf_p2p1, cc->buf_p2p1 + ret, cc->bufpos_p2p1 - ret); //may be it's better to implement ring buffer here cc->bufpos_p2p1 -= ret; cc->jam_p2p1 = 0; @@ -2631,7 +2631,7 @@ void process_c2c_write() ret = WSAGetLastError(); if (ret == WSAEWOULDBLOCK || ret == WSAENOBUFS) cc->jam_p2p1 = 1; - else + else { kill_ptr = cc; } @@ -2639,21 +2639,21 @@ void process_c2c_write() ret = errno; if (ret == EAGAIN || ret == ENOBUFS) cc->jam_p2p1 = 1; - else + else { kill_ptr = cc; } #endif - + } - + } - + cc = cc->next; - - if (kill_ptr) + + if (kill_ptr) { - cclink_list_delete(kill_ptr); + cclink_list_delete(kill_ptr); kill_ptr = 0; } } @@ -2675,7 +2675,7 @@ void process_n2n_write() if (ret > 0) { - if (ret < nl->w_pos) + if (ret < nl->w_pos) memmove(nl->w_buf, nl->w_buf + ret, nl->w_pos - ret); //may be it's better to implement ring buffer here nl->w_pos -= ret; } @@ -2696,10 +2696,10 @@ void process_n2n_write() } nl = nl->next; - - if (kill_ptr) + + if (kill_ptr) { - nodelink_list_delete(kill_ptr); + nodelink_list_delete(kill_ptr); kill_ptr = 0; } } @@ -2711,91 +2711,91 @@ void process_nodewait() while(nw) { - //PICA_debug3("checking nodewait pointer %p", nw); - switch(nw->state) - { - case PICA_NODEWAIT_RESOLVED: + //PICA_debug3("checking nodewait pointer %p", nw); + switch(nw->state) { - int skip = 0; - struct nodelink *nl; - - nl = nodelink_list_head; + case PICA_NODEWAIT_RESOLVED: + { + int skip = 0; + struct nodelink *nl; + + nl = nodelink_list_head; - while(nl && !skip)//check existing connections + while(nl && !skip)//check existing connections { - struct addrinfo *p_ai = nw->ai; + struct addrinfo *p_ai = nw->ai; - while(p_ai) //IPv6 + while(p_ai) //IPv6 { - struct sockaddr_in in = *(struct sockaddr_in*)p_ai->ai_addr; + struct sockaddr_in in = *(struct sockaddr_in*)p_ai->ai_addr; - if (nl->addr.sin_family == in.sin_family && nl->addr.sin_addr.s_addr == in.sin_addr.s_addr && nl->addr.sin_port == in.sin_port) + if (nl->addr.sin_family == in.sin_family && nl->addr.sin_addr.s_addr == in.sin_addr.s_addr && nl->addr.sin_port == in.sin_port) { - skip = 1; - break; + skip = 1; + break; } - p_ai = p_ai->ai_next; + p_ai = p_ai->ai_next; } - nl = nl->next; + nl = nl->next; } - if (!skip) - nodewait_start_connect(nw); - else + if (!skip) + nodewait_start_connect(nw); + else { - PICA_debug3("skipping node %.255s %u , connection already exist", nw->addr.addr, nw->addr.port); - kill_ptr = nw; + PICA_debug3("skipping node %.255s %u , connection already exist", nw->addr.addr, nw->addr.port); + kill_ptr = nw; } } - break; + break; - case PICA_NODEWAIT_CONNECTED: + case PICA_NODEWAIT_CONNECTED: { - struct nodelink *nlp; - - PICA_debug1("connected to %.255s %u, sending request ", nw->addr.addr, nw->addr.port); - PICA_debug2("connection socket is %i", nw->nc.sck); + struct nodelink *nlp; + + PICA_debug1("connected to %.255s %u, sending request ", nw->addr.addr, nw->addr.port); + PICA_debug2("connection socket is %i", nw->nc.sck); nlp = nodelink_list_addnew(&nw->nc); - if (nlp) + if (nlp) { - struct PICA_proto_msg *mp; - mp = nodelink_wbuf_push(nlp, PICA_PROTO_NODECONNREQ, PICA_PROTO_NODECONNREQ_SIZE); - if (mp) + struct PICA_proto_msg *mp; + mp = nodelink_wbuf_push(nlp, PICA_PROTO_NODECONNREQ, PICA_PROTO_NODECONNREQ_SIZE); + if (mp) { - mp->tail[0] = PICA_PROTO_VER_HIGH; - mp->tail[1] = PICA_PROTO_VER_LOW; + mp->tail[0] = PICA_PROTO_VER_HIGH; + mp->tail[1] = PICA_PROTO_VER_LOW; } } - PICA_nodeaddr_update(nodecfg.nodes_db_file, &nw->addr, 1); - kill_ptr = nw; + PICA_nodeaddr_update(nodecfg.nodes_db_file, &nw->addr, 1); + kill_ptr = nw; } - break; + break; - case PICA_NODEWAIT_RESOLVING_FAILED: + case PICA_NODEWAIT_RESOLVING_FAILED: { - PICA_debug1("resolving %.255s %u failed: %s", nw->addr.addr, nw->addr.port, gai_strerror(nw->ai_errorcode)); - PICA_nodeaddr_update(nodecfg.nodes_db_file, &nw->addr, 0); - kill_ptr = nw; + PICA_debug1("resolving %.255s %u failed: %s", nw->addr.addr, nw->addr.port, gai_strerror(nw->ai_errorcode)); + PICA_nodeaddr_update(nodecfg.nodes_db_file, &nw->addr, 0); + kill_ptr = nw; } - break; + break; - case PICA_NODEWAIT_CONNECT_FAILED: + case PICA_NODEWAIT_CONNECT_FAILED: { - PICA_debug1("connection to %.255s %u failed", nw->addr.addr, nw->addr.port); - PICA_debug2("socket %i is closed", nw->nc.sck); - PICA_nodeaddr_update(nodecfg.nodes_db_file, &nw->addr, 0); - kill_ptr = nw; + PICA_debug1("connection to %.255s %u failed", nw->addr.addr, nw->addr.port); + PICA_debug2("socket %i is closed", nw->nc.sck); + PICA_nodeaddr_update(nodecfg.nodes_db_file, &nw->addr, 0); + kill_ptr = nw; + } + break; } - break; - } - - nw = nw->next; - if (kill_ptr) + nw = nw->next; + + if (kill_ptr) { - nodewait_list_delete(kill_ptr); - kill_ptr = 0; + nodewait_list_delete(kill_ptr); + kill_ptr = 0; } } @@ -2806,12 +2806,12 @@ int node_loop() fd_set fds; struct timeval tv; int nfds, ret; - + do { - nfds = 0; - - FD_ZERO(&fds); + nfds = 0; + + FD_ZERO(&fds); tv.tv_sec = SELECT_TIMEOUT; tv.tv_usec = 0; @@ -2820,32 +2820,32 @@ int node_loop() c2n_set_fds(&fds, &nfds); c2c_set_fds(&fds, &nfds); n2n_set_fds(&fds, &nfds); - + ret = select(nfds + 1, &fds, 0, 0, &tv); - + if (ret < 0) { - perror("node_loop-select error "); - //ERR_CHECK - return -1; + perror("node_loop-select error "); + //ERR_CHECK + return -1; } if (ret > 0) { - process_c2n_read(&fds); - process_c2c_read(&fds); - process_n2n_read(&fds); - process_newconn_read(&fds); - process_listen_read(&fds); - } - - - process_c2n_write(); - process_c2c_write(); - process_n2n_write(); - - process_timeouts(); - process_nodewait(); + process_c2n_read(&fds); + process_c2c_read(&fds); + process_n2n_read(&fds); + process_newconn_read(&fds); + process_listen_read(&fds); + } + + + process_c2n_write(); + process_c2c_write(); + process_n2n_write(); + + process_timeouts(); + process_nodewait(); } while(1);////<<<<<<<<<< return 0; @@ -2889,36 +2889,36 @@ void process_cmdline(int argc, char** argv) while((opt = getopt(argc, argv, "f:hvV")) != -1) { - switch(opt) + switch(opt) { case 'f': - nodecfg.config_file = strdup(optarg); - break; - + nodecfg.config_file = strdup(optarg); + break; + case 'h': - print_usage(); - exit(0); - break; - + print_usage(); + exit(0); + break; + case 'v': - verbosity++; - - break; - + verbosity++; + + break; + case 'V': - print_version(); - exit(0); - break; - + print_version(); + exit(0); + break; + default: - PICA_error("unknown option - %c", optopt); - print_usage(); - exit(-1); + PICA_error("unknown option - %c", optopt); + print_usage(); + exit(-1); } } if (verbosity > 3) - verbosity = 3; + verbosity = 3; PICA_set_loglevel(PICA_LOG_INFO + verbosity); } @@ -2933,54 +2933,54 @@ void PICA_node_joinskynet(const char* addrlistfilename, const char *my_addr) ret = PICA_nodeaddr_list_load(addrlistfilename, &addrlist_h);//MEM if (ret <= 0) - return; + return; nap = addrlist_h; while(nap) { - int skip = 0; + int skip = 0; - if (0 == strncmp(nap->addr, my_addr, 256) && nap->port == atoi(nodecfg.listen_port)) + if (0 == strncmp(nap->addr, my_addr, 256) && nap->port == atoi(nodecfg.listen_port)) { - PICA_debug3("Skipping self address %.255s port %u", nap->addr, nap->port); - skip = 1; + PICA_debug3("Skipping self address %.255s port %u", nap->addr, nap->port); + skip = 1; } - - if (nodecfg.disable_reserved_addrs && INADDR_NONE != inet_addr(nap->addr) && PICA_is_reserved_addr_ipv4(inet_addr(nap->addr))) + + if (nodecfg.disable_reserved_addrs && INADDR_NONE != inet_addr(nap->addr) && PICA_is_reserved_addr_ipv4(inet_addr(nap->addr))) { - PICA_debug3("Skipping IP from private range %.255s port %u", nap->addr, nap->port); - skip = 1; + PICA_debug3("Skipping IP from private range %.255s port %u", nap->addr, nap->port); + skip = 1; } - - nl = nodelink_list_head; - //check if connection to node with current address is already established - while(nl && !skip) + + nl = nodelink_list_head; + //check if connection to node with current address is already established + while(nl && !skip) { - if (nl->node_addr) + if (nl->node_addr) { - switch(nl->addr_type) + switch(nl->addr_type) { - case PICA_PROTO_NEWNODE_IPV4: - if (0 == strncmp(nap->addr, inet_ntoa(*(struct in_addr*) & (((struct PICA_nodeaddr_ipv4*)nl->node_addr)->addr)) , 16) - && - nap->port == ntohs(((struct PICA_nodeaddr_ipv4*)nl->node_addr)->port)) - skip = 1; - break; - //IPv6 + case PICA_PROTO_NEWNODE_IPV4: + if (0 == strncmp(nap->addr, inet_ntoa(*(struct in_addr*) & (((struct PICA_nodeaddr_ipv4*)nl->node_addr)->addr)), 16) + && + nap->port == ntohs(((struct PICA_nodeaddr_ipv4*)nl->node_addr)->port)) + skip = 1; + break; + //IPv6 } } - + if (0 == strncmp(nap->addr, inet_ntoa(nl->addr.sin_addr), 16) && nap->port == ntohs(nl->addr.sin_port)) - skip = 1; - - - nl = nl->next; + skip = 1; + + + nl = nl->next; } - - if (!skip) - nodewait_start_resolve(nap); - + + if (!skip) + nodewait_start_resolve(nap); + nap = nap->next; } @@ -2996,7 +2996,7 @@ int main(int argc, char** argv) if (!PICA_nodeconfig_load(nodecfg.config_file)) { - PICA_fatal("Unable to load configuration. Please check if config file %s exists and has correct permissions", nodecfg.config_file); + PICA_fatal("Unable to load configuration. Please check if config file %s exists and has correct permissions", nodecfg.config_file); } PICA_debug1("nodecfg.config_file = %s", nodecfg.config_file); @@ -3006,20 +3006,20 @@ int main(int argc, char** argv) PICA_debug1("nodecfg.disable_reserved_addrs = %s", nodecfg.disable_reserved_addrs ? "yes" : "no"); if (!PICA_node_init()) - return -1; + return -1; if (INADDR_NONE == inet_addr(nodecfg.announced_addr) || INADDR_ANY == inet_addr(nodecfg.announced_addr)) { - PICA_fatal("announced_addr (%.16s) is invalid or not configured. Please set correct public IP address of your pica-node instance in config file.", - nodecfg.announced_addr - ); + PICA_fatal("announced_addr (%.16s) is invalid or not configured. Please set correct public IP address of your pica-node instance in config file.", + nodecfg.announced_addr + ); } - + if (nodecfg.disable_reserved_addrs && PICA_is_reserved_addr_ipv4(inet_addr(nodecfg.announced_addr))) { - PICA_fatal("announced_addr (%.16s) is in private range and is unacceptable for global Internet. Private ranges are disabled by node configuration.", - nodecfg.announced_addr - ); + PICA_fatal("announced_addr (%.16s) is in private range and is unacceptable for global Internet. Private ranges are disabled by node configuration.", + nodecfg.announced_addr + ); } PICA_node_joinskynet(nodecfg.nodes_db_file, nodecfg.announced_addr);//CONF-CONF имя файла с адресами узлов, свой адрес |