From 74419352eeeb2e7b8717978f782d20ff788c0e56 Mon Sep 17 00:00:00 2001 From: me_desk Date: Fri, 30 Jan 2015 19:53:56 +0000 Subject: added new protocol messages definitions, updated protocol version git-svn-id: svn://localhost/project_picapica/trunk@339 fb96df88-216d-11de-830c-f3023f12d8ac --- PICA_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 50751d4..da192ee 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -65,8 +65,8 @@ const struct PICA_msginfo c2c_messages[] = { {PICA_PROTO_SENDFILEREQUEST, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_SENDFILEREQUEST}, {PICA_PROTO_ACCEPTEDFILE, PICA_MSG_FIXED_SIZE, PICA_PROTO_ACCEPTEDFILE_SIZE, procmsg_ACCEPTEDFILE}, {PICA_PROTO_DENIEDFILE, PICA_MSG_FIXED_SIZE, PICA_PROTO_DENIEDFILE_SIZE, procmsg_DENIEDFILE}, - {PICA_PROTO_FILEFRAGMENT, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_FILEFRAGMENT}, - {PICA_PROTO_FILECONTROL, PICA_MSG_FIXED_SIZE, PICA_PROTO_FILECONTROL_SIZE, procmsg_FILECONTROL} + {PICA_PROTO_FILEFRAGMENT, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_FILEFRAGMENT}, + {PICA_PROTO_FILECONTROL, PICA_MSG_FIXED_SIZE, PICA_PROTO_FILECONTROL_SIZE, procmsg_FILECONTROL} }; struct PICA_msginfo c2n_init_messages[] = { -- cgit v1.2.1 From c6f557b7259ee8c8b5d71706abd3ac9b6db0bff8 Mon Sep 17 00:00:00 2001 From: me_desk Date: Fri, 30 Jan 2015 20:10:57 +0000 Subject: renamed structs PICA_conninfo to PICA_c2n (client-to-node) and PICA_chaninfo to PICA_c2c (client-to-client) git-svn-id: svn://localhost/project_picapica/trunk@340 fb96df88-216d-11de-830c-f3023f12d8ac --- PICA_client.c | 112 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index da192ee..c30f283 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -28,10 +28,10 @@ static pthread_mutex_t *mt_locks; #endif -static int PICA_send_file_fragment(struct PICA_chaninfo *chn); -static int PICA_sendfile_open_read(struct PICA_chaninfo *chn, const char *filename_utf8, uint64_t *file_size); -static int PICA_recvfile_open_write(struct PICA_chaninfo *chn, const char *filename_utf8, unsigned int filenamesize); -static int PICA_send_filecontrol(struct PICA_chaninfo *chan, int senderctl, int receiverctl); +static int PICA_send_file_fragment(struct PICA_c2c *chn); +static int PICA_sendfile_open_read(struct PICA_c2c *chn, const char *filename_utf8, uint64_t *file_size); +static int PICA_recvfile_open_write(struct PICA_c2c *chn, const char *filename_utf8, unsigned int filenamesize); +static int PICA_send_filecontrol(struct PICA_c2c *chan, int senderctl, int receiverctl); static unsigned int procmsg_INITRESP(unsigned char*,unsigned int,void*); static unsigned int procmsg_CONNREQINC(unsigned char*,unsigned int,void*); @@ -47,8 +47,8 @@ static unsigned int procmsg_DENIEDFILE(unsigned char*,unsigned int,void*); static unsigned int procmsg_FILEFRAGMENT(unsigned char*,unsigned int,void*); static unsigned int procmsg_FILECONTROL(unsigned char*,unsigned int,void*); -static struct PICA_proto_msg* c2n_writebuf_push(struct PICA_conninfo *ci, unsigned int msgid, unsigned int size); -static struct PICA_proto_msg* c2c_writebuf_push(struct PICA_chaninfo *chn, unsigned int msgid, unsigned int size); +static struct PICA_proto_msg* c2n_writebuf_push(struct PICA_c2n *ci, unsigned int msgid, unsigned int size); +static struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned int msgid, unsigned int size); #define MSGINFO_MSGSNUM(arr) (sizeof(arr)/sizeof(struct PICA_msginfo)) const struct PICA_msginfo c2n_messages[] = { @@ -193,11 +193,11 @@ if (!preverify_ok) { return preverify_ok; } -static int add_chaninfo(struct PICA_conninfo *ci, struct PICA_chaninfo **chn, const unsigned char *peer_id, int is_outgoing) +static int add_chaninfo(struct PICA_c2n *ci, struct PICA_c2c **chn, const unsigned char *peer_id, int is_outgoing) { -struct PICA_chaninfo *chnl,*ipt; +struct PICA_c2c *chnl,*ipt; -chnl=*chn=(struct PICA_chaninfo*)calloc(sizeof(struct PICA_chaninfo),1); +chnl=*chn=(struct PICA_c2c*)calloc(sizeof(struct PICA_c2c),1); if (!chnl) return 0;//ERR_CHECK @@ -227,7 +227,7 @@ else return 1; } -static int establish_data_connection(struct PICA_chaninfo *chnl) +static int establish_data_connection(struct PICA_c2c *chnl) { char* DN_str; //unsigned char buf[12]; @@ -400,7 +400,7 @@ return err_ret; static unsigned int procmsg_INITRESP(unsigned char* buf, unsigned int nb,void* p) { -struct PICA_conninfo *ci=(struct PICA_conninfo *)p; +struct PICA_c2n *ci=(struct PICA_c2n *)p; switch(buf[0]) { @@ -424,14 +424,14 @@ return 1; static unsigned int procmsg_CONNREQINC(unsigned char* buf,unsigned int nb,void* p) { int ret; -struct PICA_conninfo *ci=(struct PICA_conninfo *)p; +struct PICA_c2n *ci=(struct PICA_c2n *)p; struct PICA_proto_msg *mp; unsigned char *peer_id = buf + 2; if (callbacks.accept_cb(peer_id)) { - struct PICA_chaninfo *_chnl; + struct PICA_c2c *_chnl; mp = c2n_writebuf_push( ci, PICA_PROTO_CONNALLOW, PICA_PROTO_CONNALLOW_SIZE); @@ -480,8 +480,8 @@ return 1; static unsigned int procmsg_NOTFOUND(unsigned char* buf,unsigned int nb,void* p) { -struct PICA_conninfo *ci=(struct PICA_conninfo *)p; -struct PICA_chaninfo *ipt,*rq=0; +struct PICA_c2n *ci=(struct PICA_c2n *)p; +struct PICA_c2c *ipt,*rq=0; unsigned char *peer_id = buf + 2; //puts("procmsg_NOTFOUND");//debug @@ -511,8 +511,8 @@ return 1; static unsigned int procmsg_FOUND(unsigned char* buf,unsigned int nb,void* p) { -struct PICA_conninfo *ci=(struct PICA_conninfo *)p; -struct PICA_chaninfo *ipt,*rq=0; +struct PICA_c2n *ci=(struct PICA_c2n *)p; +struct PICA_c2c *ipt,*rq=0; unsigned char *peer_id = buf + 2; int ret; @@ -609,7 +609,7 @@ return 1; static unsigned int procmsg_MSGUTF8(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_chaninfo *chan = (struct PICA_chaninfo *)p; +struct PICA_c2c *chan = (struct PICA_c2c *)p; struct PICA_proto_msg *mp; callbacks.newmsg_cb(chan->peer_id, buf + 4, nb - 4, buf[0]); @@ -629,7 +629,7 @@ return 1; static unsigned int procmsg_MSGOK(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_chaninfo *chan = (struct PICA_chaninfo *)p; +struct PICA_c2c *chan = (struct PICA_c2c *)p; callbacks.msgok_cb(chan -> peer_id); return 1; @@ -637,7 +637,7 @@ return 1; unsigned int procmsg_PINGREQ(unsigned char* buf,unsigned int nb,void* p) { -struct PICA_conninfo *ci=(struct PICA_conninfo *)p; +struct PICA_c2n *ci=(struct PICA_c2n *)p; struct PICA_proto_msg *mp; mp = c2n_writebuf_push(ci, PICA_PROTO_PINGREP, PICA_PROTO_PINGREP_SIZE); @@ -652,7 +652,7 @@ else return 1; } -int PICA_deny_file(struct PICA_chaninfo *chan) +int PICA_deny_file(struct PICA_c2c *chan) { struct PICA_proto_msg *mp; @@ -673,7 +673,7 @@ else return PICA_OK; } -int PICA_accept_file(struct PICA_chaninfo *chan, char *filename, unsigned int filenamesize) +int PICA_accept_file(struct PICA_c2c *chan, char *filename, unsigned int filenamesize) { struct PICA_proto_msg *mp; int ret; @@ -703,7 +703,7 @@ return PICA_OK; static unsigned int procmsg_SENDFILEREQUEST(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_chaninfo *chan = (struct PICA_chaninfo *)p; +struct PICA_c2c *chan = (struct PICA_c2c *)p; struct PICA_proto_msg *mp; int ret; @@ -740,7 +740,7 @@ return 1; static unsigned int procmsg_ACCEPTEDFILE(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_chaninfo *chan = (struct PICA_chaninfo *)p; +struct PICA_c2c *chan = (struct PICA_c2c *)p; if (chan->sendfilestate != PICA_CHANSENDFILESTATE_SENTREQ) return 0; @@ -754,7 +754,7 @@ return 1; static unsigned int procmsg_DENIEDFILE(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_chaninfo *chan = (struct PICA_chaninfo *)p; +struct PICA_c2c *chan = (struct PICA_c2c *)p; if (chan->sendfilestate != PICA_CHANSENDFILESTATE_SENTREQ) return 0; @@ -771,7 +771,7 @@ return 1; static unsigned int procmsg_FILEFRAGMENT(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_chaninfo *chan = (struct PICA_chaninfo *)p; +struct PICA_c2c *chan = (struct PICA_c2c *)p; /* *Allow incoming FILEFRAGMENTs while paused @@ -818,7 +818,7 @@ return 1; static unsigned int procmsg_FILECONTROL(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_chaninfo *chan = (struct PICA_chaninfo *)p; +struct PICA_c2c *chan = (struct PICA_c2c *)p; unsigned int sender_cmd, receiver_cmd; sender_cmd = buf[2]; @@ -997,7 +997,7 @@ return 1; //cert_file - имя файла, содержащего сертфикат клиента в формате PEM //pkey_file - имя файла, содержащего приватный ключ в формате PEM //password_cb - callback-функция, запрашивающая пароль к приватному ключу, см. man 3 SSL_CTX_set_default_passwd_cb;в userdata передается указатель на id -//ci -указатель на указатель на структуру PICA_conninfo, который будет проинициализирован при успешном выполнении функции +//ci -указатель на указатель на структуру PICA_c2n, который будет проинициализирован при успешном выполнении функции //Память, выделенная под структуру, освобождается при вызове PICA_close_connection //Возвращаемое значение - код завершения //PICA_OK - успешное завершение функции @@ -1010,10 +1010,10 @@ int PICA_new_connection(const char *nodeaddr, const char *pkey_file, const char *dh_param_file, int (*password_cb)(char *buf, int size, int rwflag, void *userdata), - struct PICA_conninfo **ci) + struct PICA_c2n **ci) { int ret,ret_err; -struct PICA_conninfo *cid; +struct PICA_c2n *cid; struct sockaddr_in a; DH *dh = NULL; FILE *dh_file = NULL; @@ -1023,7 +1023,7 @@ if (!(nodeaddr && CA_file && cert_file && pkey_file && ci)) return PICA_ERRINVARG; -cid=*ci=(struct PICA_conninfo*)calloc(sizeof(struct PICA_conninfo),1);//(1) +cid=*ci=(struct PICA_c2n*)calloc(sizeof(struct PICA_c2n),1);//(1) if (!cid) return PICA_ERRNOMEM; @@ -1268,10 +1268,10 @@ return ret_err; //создает ИСХОДЯЩИЙ логический зашифрованный канал связи с указанным собеседником, если тот доступен // в данный момент. -int PICA_create_channel(struct PICA_conninfo *ci,const unsigned char *peer_id,struct PICA_chaninfo **chn) +int PICA_create_channel(struct PICA_c2n *ci,const unsigned char *peer_id,struct PICA_c2c **chn) { struct PICA_proto_msg *mp; -struct PICA_chaninfo *chnl; +struct PICA_c2c *chnl; if (!(ci && chn)) return PICA_ERRINVARG; @@ -1294,11 +1294,11 @@ mp = c2n_writebuf_push( ci, PICA_PROTO_CONNREQOUTG, PICA_PROTO_CONNREQOUTG_SIZE) return PICA_OK; } -int PICA_read(struct PICA_conninfo *ci,int timeout) +int PICA_read(struct PICA_c2n *ci,int timeout) { fd_set fds; struct timeval tv={0,1000}; -struct PICA_chaninfo *ipt, *kill_ptr = 0; +struct PICA_c2c *ipt, *kill_ptr = 0; int ret,nfds; //puts("PICA_read<<");//debug @@ -1379,9 +1379,9 @@ if (ret>0) return PICA_OK; } -int PICA_write(struct PICA_conninfo *ci) +int PICA_write(struct PICA_c2n *ci) { -struct PICA_chaninfo *ipt, *kill_ptr = 0; +struct PICA_c2c *ipt, *kill_ptr = 0; int ret = PICA_OK; //puts("PICA_write>>");//debug @@ -1494,7 +1494,7 @@ return PICA_OK; //int PICA_read_socket() //int PICA_read_ssl() -int PICA_write_c2n(struct PICA_conninfo *ci) +int PICA_write_c2n(struct PICA_c2n *ci) { int ret = PICA_ERRINVARG; @@ -1506,7 +1506,7 @@ else if (PICA_CONNSTATE_CONNECTED == ci->state) return ret; } -int PICA_write_c2c(struct PICA_chaninfo *chn) +int PICA_write_c2c(struct PICA_c2c *chn) { int ret = PICA_ERRINVARG; @@ -1590,7 +1590,7 @@ if (ret > 0) return PICA_OK; } -int PICA_read_c2c(struct PICA_chaninfo *chn) +int PICA_read_c2c(struct PICA_c2c *chn) { int ret; @@ -1610,7 +1610,7 @@ return ret; } //функция читает и обрабатывает данные, приходящие от сервера по управляющему соединению. -int PICA_read_c2n(struct PICA_conninfo *ci) +int PICA_read_c2n(struct PICA_c2n *ci) { int ret; @@ -1636,7 +1636,7 @@ if (ret == PICA_OK) return ret; } -struct PICA_proto_msg* c2n_writebuf_push(struct PICA_conninfo *ci, unsigned int msgid, unsigned int size) +struct PICA_proto_msg* c2n_writebuf_push(struct PICA_c2n *ci, unsigned int msgid, unsigned int size) { struct PICA_proto_msg *mp; @@ -1669,7 +1669,7 @@ ci->write_pos += size; return mp; } -struct PICA_proto_msg* c2c_writebuf_push(struct PICA_chaninfo *chn, unsigned int msgid, unsigned int size) +struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned int msgid, unsigned int size) { struct PICA_proto_msg *mp; @@ -1702,7 +1702,7 @@ chn->write_pos += size; return mp; } -int PICA_send_msg(struct PICA_chaninfo *chn, char *buf,unsigned int len) +int PICA_send_msg(struct PICA_c2c *chn, char *buf,unsigned int len) { struct PICA_proto_msg *mp; @@ -1720,7 +1720,7 @@ else return PICA_OK; } -int PICA_send_file(struct PICA_chaninfo *chn, const char *filepath) +int PICA_send_file(struct PICA_c2c *chn, const char *filepath) { struct PICA_proto_msg *mp; size_t namelen; @@ -1771,7 +1771,7 @@ chn->sendfile_pos = 0; return PICA_OK; } -int PICA_pause_file(struct PICA_chaninfo *chan, int sending) +int PICA_pause_file(struct PICA_c2c *chan, int sending) { int senderctl = PICA_PROTO_FILECONTROL_VOID; int receiverctl = PICA_PROTO_FILECONTROL_VOID; @@ -1800,7 +1800,7 @@ if (sending) return PICA_send_filecontrol(chan, senderctl, receiverctl); } -int PICA_resume_file(struct PICA_chaninfo *chan, int sending) +int PICA_resume_file(struct PICA_c2c *chan, int sending) { int senderctl = PICA_PROTO_FILECONTROL_VOID; int receiverctl = PICA_PROTO_FILECONTROL_VOID; @@ -1827,7 +1827,7 @@ if (sending) return PICA_send_filecontrol(chan, senderctl, receiverctl); } -int PICA_cancel_file(struct PICA_chaninfo *chan, int sending) +int PICA_cancel_file(struct PICA_c2c *chan, int sending) { int senderctl = PICA_PROTO_FILECONTROL_VOID; int receiverctl = PICA_PROTO_FILECONTROL_VOID; @@ -1860,7 +1860,7 @@ if (sending) return PICA_send_filecontrol(chan, senderctl, receiverctl); } -int PICA_send_filecontrol(struct PICA_chaninfo *chan, int senderctl, int receiverctl) +int PICA_send_filecontrol(struct PICA_c2c *chan, int senderctl, int receiverctl) { struct PICA_proto_msg *mp; @@ -1877,7 +1877,7 @@ else return PICA_OK; } -int PICA_send_file_fragment(struct PICA_chaninfo *chn) +int PICA_send_file_fragment(struct PICA_c2c *chn) { struct PICA_proto_msg *mp; char buf[PICA_FILEFRAGMENTSIZE]; @@ -1929,9 +1929,9 @@ if (chn->sendfile_pos > chn->sendfile_size) return PICA_OK; } -void PICA_close_channel(struct PICA_chaninfo *chn) +void PICA_close_channel(struct PICA_c2c *chn) { -struct PICA_chaninfo *ipt; +struct PICA_c2c *ipt; fprintf(stderr, "PICA_close_channel(%p)\n", chn);//debug @@ -1994,9 +1994,9 @@ free(chn); //puts("PICA_close_channel_chkp7");//debug } -void PICA_close_connection(struct PICA_conninfo *cid) +void PICA_close_connection(struct PICA_c2n *cid) { -struct PICA_chaninfo *ipt; +struct PICA_c2c *ipt; while((ipt = cid->chan_list_head)) PICA_close_channel(ipt); @@ -2041,7 +2041,7 @@ free(cid); #endif -int PICA_sendfile_open_read(struct PICA_chaninfo *chn, const char *filename_utf8, uint64_t *file_size) +int PICA_sendfile_open_read(struct PICA_c2c *chn, const char *filename_utf8, uint64_t *file_size) { #ifdef WIN32 { @@ -2093,7 +2093,7 @@ if (fseeko(chn->sendfile_stream, 0, SEEK_SET) != 0) return PICA_OK; } -int PICA_recvfile_open_write(struct PICA_chaninfo *chn, const char *filename_utf8, unsigned int filenamesize) +int PICA_recvfile_open_write(struct PICA_c2c *chn, const char *filename_utf8, unsigned int filenamesize) { ///////////// #ifdef WIN32 -- cgit v1.2.1 From 94587f893a83cf505d655169b6b45b24345a8aa9 Mon Sep 17 00:00:00 2001 From: me_desk Date: Mon, 9 Mar 2015 23:41:26 +0000 Subject: new structs PICA_acc - represents account credentials, certificate file and private key and PICA_listener - represents port opened on client for accepting incoming direct p2p (client-to-client, bypassing node) connections; new functions for handling PICA_acc and PICA_listener, moved part of code from PICA_new_connection() to PICA_open_acc() git-svn-id: svn://localhost/project_picapica/trunk@341 fb96df88-216d-11de-830c-f3023f12d8ac --- PICA_client.c | 264 +++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 180 insertions(+), 84 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index c30f283..4b6f3a9 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -46,6 +46,7 @@ static unsigned int procmsg_ACCEPTEDFILE(unsigned char*,unsigned int,void*); static unsigned int procmsg_DENIEDFILE(unsigned char*,unsigned int,void*); static unsigned int procmsg_FILEFRAGMENT(unsigned char*,unsigned int,void*); static unsigned int procmsg_FILECONTROL(unsigned char*,unsigned int,void*); +static unsigned int procmsg_INITRESP_c2c(unsigned char*,unsigned int,void*); static struct PICA_proto_msg* c2n_writebuf_push(struct PICA_c2n *ci, unsigned int msgid, unsigned int size); static struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned int msgid, unsigned int size); @@ -70,10 +71,14 @@ const struct PICA_msginfo c2c_messages[] = { }; struct PICA_msginfo c2n_init_messages[] = { - {PICA_PROTO_INITRESPOK, PICA_MSG_FIXED_SIZE, PICA_PROTO_INITRESPOK_SIZE, procmsg_INITRESP}, - {PICA_PROTO_VERDIFFER, PICA_MSG_FIXED_SIZE, PICA_PROTO_VERDIFFER_SIZE, procmsg_INITRESP} + {PICA_PROTO_INITRESPOK, PICA_MSG_FIXED_SIZE, PICA_PROTO_INITRESPOK_SIZE, procmsg_INITRESP}, + {PICA_PROTO_VERDIFFER, PICA_MSG_FIXED_SIZE, PICA_PROTO_VERDIFFER_SIZE, procmsg_INITRESP} }; +struct PICA_msginfo c2c_init_messages[] = { + {PICA_PROTO_INITRESPOK, PICA_MSG_FIXED_SIZE, PICA_PROTO_INITRESPOK_SIZE, procmsg_INITRESP_c2c}, + {PICA_PROTO_VERDIFFER, PICA_MSG_FIXED_SIZE, PICA_PROTO_VERDIFFER_SIZE, procmsg_INITRESP_c2c} +}; // static int pem_passwd_cb(char *buf, int size, int rwflag, void *userdata) //{ @@ -206,6 +211,8 @@ chnl->conn = ci; chnl->outgoing = is_outgoing; memcpy(chnl->peer_id, peer_id, PICA_ID_SIZE); +chnl->acc = ci->acc; + chnl->timestamp = time(0); chnl->sck_data = -1;//prevent closing stdin when closing non-active connection @@ -243,7 +250,7 @@ struct sockaddr_in addr=chnl->conn->srv_addr; addr.sin_port = htons(ntohs(addr.sin_port)); ret=connect( chnl->sck_data, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)); - +/////////////////state_ if (ret==SOCKET_ERROR) { err_ret=PICA_ERRSOCK; @@ -256,13 +263,13 @@ if (mp) { if (chnl->outgoing) { - memcpy(mp->tail, chnl->conn->id, PICA_ID_SIZE);//вызвывающий + memcpy(mp->tail, chnl->acc->id, PICA_ID_SIZE);//вызвывающий memcpy(mp->tail + PICA_ID_SIZE, chnl->peer_id, PICA_ID_SIZE);//вызываемый } else { memcpy(mp->tail, chnl->peer_id, PICA_ID_SIZE);//вызвывающий - memcpy(mp->tail + PICA_ID_SIZE, chnl->conn->id, PICA_ID_SIZE);//вызываемый + memcpy(mp->tail + PICA_ID_SIZE, chnl->acc->id, PICA_ID_SIZE);//вызываемый } } else @@ -279,7 +286,7 @@ do } while( chnl->write_pos > 0); -chnl->ssl=SSL_new(chnl->conn->ctx); +chnl->ssl=SSL_new(chnl->acc->ctx); if (!chnl->ssl) { @@ -305,7 +312,7 @@ if (chnl->outgoing) ret=SSL_connect(chnl->ssl); else ret=SSL_accept(chnl->ssl); - +/////////////////state_ //printf("verify result:%i\n",(int)SSL_get_verify_result(chnl->ssl));//debug if (ret!=1) @@ -398,6 +405,10 @@ PICA_close_channel(chnl); return err_ret; } +static unsigned int procmsg_INITRESP_c2c(unsigned char* buf, unsigned int nb,void* p) +{ +} + static unsigned int procmsg_INITRESP(unsigned char* buf, unsigned int nb,void* p) { struct PICA_c2n *ci=(struct PICA_c2n *)p; @@ -987,61 +998,67 @@ signal(SIGPIPE, SIG_IGN); return 1; } -/*адрес сервера, сертификат клиента и закрытый ключ*/ +static int check_pkey_passphrase(const char *pkey_file, + int (*password_cb)(char *buf, int size, int rwflag, void *userdata), + void *userdata) +{ +RSA *rsa; +FILE *f; -//Осуществляет подключение к серверу по указанному адресу. -//Аргументы: -//nodeaddr - адрес узла -//port - номер порта, в нативном для хост-машины порядке байт -//CA_file - имя файла, содержащего корневой сертификат в формате PEM -//cert_file - имя файла, содержащего сертфикат клиента в формате PEM -//pkey_file - имя файла, содержащего приватный ключ в формате PEM -//password_cb - callback-функция, запрашивающая пароль к приватному ключу, см. man 3 SSL_CTX_set_default_passwd_cb;в userdata передается указатель на id -//ci -указатель на указатель на структуру PICA_c2n, который будет проинициализирован при успешном выполнении функции -//Память, выделенная под структуру, освобождается при вызове PICA_close_connection -//Возвращаемое значение - код завершения -//PICA_OK - успешное завершение функции -//.... -int PICA_new_connection(const char *nodeaddr, - unsigned int port, - const char *CA_file, - const char *cert_file, - const char *pkey_file, - const char *dh_param_file, - int (*password_cb)(char *buf, int size, int rwflag, void *userdata), - struct PICA_c2n **ci) +f = fopen(pkey_file, "r"); + +if (!f) + return PICA_ERRINVPKEYFILE; + +rsa = PEM_read_RSAPrivateKey(f, NULL, password_cb, userdata); + +fclose(f); + +if (!rsa) + { + unsigned long int e = ERR_get_error(); + + // 0x6065064 is an OpenSSL error code corresponding to decryption failure + if (e == 0x6065064 || strcmp("bad decrypt", ERR_reason_error_string(e)) == 0) + return PICA_ERRINVPKEYPASSPHRASE; + + return PICA_ERRINVPKEYFILE; + } + +RSA_free(rsa); + +return PICA_OK; +} + +int PICA_open_acc(const char *cert_file, + const char *pkey_file, + const char *dh_param_file, + int (*password_cb)(char *buf, int size, int rwflag, void *userdata), + struct PICA_acc **acc) { int ret,ret_err; -struct PICA_c2n *cid; -struct sockaddr_in a; DH *dh = NULL; FILE *dh_file = NULL; +struct PICA_acc *a = NULL; -if (!(nodeaddr && CA_file && cert_file && pkey_file && ci)) - return PICA_ERRINVARG; +if (!(cert_file && pkey_file && dh_param_file && acc)) + return PICA_ERRINVARG; +a = *acc = (struct PICA_acc*)calloc(sizeof(struct PICA_acc), 1);//(1) -cid=*ci=(struct PICA_c2n*)calloc(sizeof(struct PICA_c2n),1);//(1) -if (!cid) - return PICA_ERRNOMEM; +if (!a) + return PICA_ERRNOMEM; -cid->read_buf = calloc(PICA_CONNREADBUFSIZE, 1);//(2) -if (!cid->read_buf) +a->ctx = SSL_CTX_new(TLSv1_2_method());//(2) + +if (!a->ctx) { - ret_err = PICA_ERRNOMEM; + ret_err=PICA_ERRSSL; goto error_ret_1; } -cid->ctx=SSL_CTX_new(TLSv1_2_method());//(3) - -if (!cid->ctx) - { - ret_err=PICA_ERRSSL; - goto error_ret_2; - } - dh_file = fopen(dh_param_file, "r"); if (dh_file) @@ -1050,45 +1067,56 @@ if (dh_file) fclose(dh_file); } -if (1 != SSL_CTX_set_tmp_dh(cid->ctx, dh)) +if (1 != SSL_CTX_set_tmp_dh(a->ctx, dh)) { ret_err = PICA_ERRSSL; goto error_ret_2; } -DH_free (dh); +DH_free(dh); -if (!PICA_get_id_from_cert_file(cert_file, cid->id)) +if (!PICA_get_id_from_cert_file(cert_file, a->id)) { - ret_err=PICA_ERRINVCERT; - goto error_ret_3; + ret_err = PICA_ERRINVCERT; + goto error_ret_2; + } + +ret = check_pkey_passphrase(pkey_file, password_cb, a->id); + +if (ret != PICA_OK) + { + ret_err = ret; + goto error_ret_2; } + ////<< if (password_cb) { - SSL_CTX_set_default_passwd_cb(cid->ctx, password_cb); - SSL_CTX_set_default_passwd_cb_userdata(cid->ctx,cid->id); + SSL_CTX_set_default_passwd_cb(a->ctx, password_cb); + SSL_CTX_set_default_passwd_cb_userdata(a->ctx, a->id); } -ret=SSL_CTX_use_certificate_file(cid->ctx,cert_file,SSL_FILETYPE_PEM); -if (ret!=1) - {//ERR_CHECK - ret_err=PICA_ERRSSL; - goto error_ret_3; - } -ret=SSL_CTX_use_PrivateKey_file(cid->ctx,pkey_file,SSL_FILETYPE_PEM); -if (ret!=1) - {//ERR_CHECK - ret_err=PICA_ERRSSL; - goto error_ret_3; +ret = SSL_CTX_use_certificate_file(a->ctx, cert_file, SSL_FILETYPE_PEM); + +if (ret != 1) + { + ret_err=PICA_ERRSSL; + goto error_ret_2; + } + +ret = SSL_CTX_use_PrivateKey_file(a->ctx, pkey_file, SSL_FILETYPE_PEM); +if (ret != 1) + { + ret_err = PICA_ERRSSL; + goto error_ret_2; } ////<< -ret=SSL_CTX_load_verify_locations(cid->ctx,CA_file,0/*"trustedCA/"*/); +//ret=SSL_CTX_load_verify_locations(cid->ctx,CA_file,0/*"trustedCA/"*/); //printf("loadverifylocations ret=%i\n",ret);//debug -SSL_CTX_set_client_CA_list(cid->ctx,SSL_load_client_CA_file(CA_file)); +//SSL_CTX_set_client_CA_list(cid->ctx,SSL_load_client_CA_file(CA_file)); -ret = SSL_CTX_set_cipher_list(cid->ctx,"DHE-RSA-CAMELLIA256-SHA"/*:DHE-RSA-AES256-SHA256"*/); +ret = SSL_CTX_set_cipher_list(a->ctx,"DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CAMELLIA256-SHA"); if (ret != 1) { @@ -1096,13 +1124,66 @@ if (ret != 1) goto error_ret_2; } +return PICA_OK; + +error_ret_2: //(2) +SSL_CTX_free(a->ctx); + +error_ret_1: //(1) +free(a); +*acc = 0; + +return ret_err; +} + +/*адрес сервера, сертификат клиента и закрытый ключ*/ + +//Осуществляет подключение к серверу по указанному адресу. +//Аргументы: +//nodeaddr - адрес узла +//port - номер порта, в нативном для хост-машины порядке байт +//CA_file - имя файла, содержащего корневой сертификат в формате PEM +//cert_file - имя файла, содержащего сертфикат клиента в формате PEM +//pkey_file - имя файла, содержащего приватный ключ в формате PEM +//password_cb - callback-функция, запрашивающая пароль к приватному ключу, см. man 3 SSL_CTX_set_default_passwd_cb;в userdata передается указатель на id +//ci -указатель на указатель на структуру PICA_c2n, который будет проинициализирован при успешном выполнении функции +//Память, выделенная под структуру, освобождается при вызове PICA_close_connection +//Возвращаемое значение - код завершения +//PICA_OK - успешное завершение функции +//.... + +int PICA_new_connection(const struct PICA_acc *acc, const char *nodeaddr, + unsigned int port, + struct PICA_c2n **ci) +{ +int ret,ret_err; +struct PICA_c2n *cid; +struct sockaddr_in a; + + +if (!(nodeaddr && acc && port && ci)) + return PICA_ERRINVARG; + + +cid=*ci=(struct PICA_c2n*)calloc(sizeof(struct PICA_c2n),1);//(1) +if (!cid) + return PICA_ERRNOMEM; -cid->ssl_comm=SSL_new(cid->ctx);//(4) +cid->acc = acc; + +cid->read_buf = calloc(PICA_CONNREADBUFSIZE, 1);//(2) +if (!cid->read_buf) + { + ret_err = PICA_ERRNOMEM; + goto error_ret_1; + } + +cid->ssl_comm=SSL_new(acc->ctx);//(3) if (!cid->ssl_comm) { ret_err=PICA_ERRSSL; - goto error_ret_3; + goto error_ret_2; } @@ -1144,18 +1225,18 @@ cid->sck_comm=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);//(5) if (cid->sck_comm==SOCKET_ERROR) { ret_err=PICA_ERRSOCK; - goto error_ret_4; + goto error_ret_3; } cid->state = PICA_CONNSTATE_CONNECTING; ret=connect(cid->sck_comm,(struct sockaddr*)&a,sizeof(struct sockaddr_in)); - +/////////////////state_ if (ret==SOCKET_ERROR) { ret_err=PICA_ERRSOCK; - goto error_ret_5; + goto error_ret_4; } @@ -1172,10 +1253,12 @@ if (mp) else { ret_err = PICA_ERRNOMEM; - goto error_ret_5; + goto error_ret_4; } } +cid->state = PICA_CONNSTATE_WAITINGREP; + do { ret = PICA_write_c2n(cid); @@ -1204,7 +1287,7 @@ if (cid->init_resp_ok != 1) else ret_err = PICA_ERRPROTOOLD; } - goto error_ret_5; + goto error_ret_4; } //printf("6\n");//debug @@ -1214,13 +1297,14 @@ ret=SSL_set_fd(cid->ssl_comm,cid->sck_comm); //printf("SSL_set_fd=%i\n",ret); ret=SSL_accept(cid->ssl_comm); - +/////////////////state_ +cid->state = PICA_CONNSTATE_WAITINGTLS; if (ret!=1) { //printf("SSL_accept ret=%i\n SSL_get_error=%i\n",ret,SSL_get_error(cid->ssl_comm,ret));//debug //ERR_CHECK ret_err=PICA_ERRSSL; - goto error_ret_5; + goto error_ret_4; } cid->state = PICA_CONNSTATE_CONNECTED;//<<sck_comm, &arg); return PICA_OK; -error_ret_5: //(5) +error_ret_4: //(4) SHUTDOWN(cid->sck_comm); CLOSE(cid->sck_comm); -error_ret_4: //(4) - SSL_free(cid->ssl_comm); - error_ret_3: //(3) - SSL_CTX_free(cid->ctx); + SSL_free(cid->ssl_comm); error_ret_2: //(2) free(cid->read_buf); @@ -1268,7 +1349,7 @@ return ret_err; //создает ИСХОДЯЩИЙ логический зашифрованный канал связи с указанным собеседником, если тот доступен // в данный момент. -int PICA_create_channel(struct PICA_c2n *ci,const unsigned char *peer_id,struct PICA_c2c **chn) +int PICA_create_channel(struct PICA_c2n *ci,const unsigned char *peer_id, struct PICA_listener *l,struct PICA_c2c **chn) { struct PICA_proto_msg *mp; struct PICA_c2c *chnl; @@ -1294,6 +1375,11 @@ mp = c2n_writebuf_push( ci, PICA_PROTO_CONNREQOUTG, PICA_PROTO_CONNREQOUTG_SIZE) return PICA_OK; } +int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listeners) +{ + +} + int PICA_read(struct PICA_c2n *ci,int timeout) { fd_set fds; @@ -1614,6 +1700,11 @@ int PICA_read_c2n(struct PICA_c2n *ci) { int ret; +switch(ci->state) +{ +//<<< +} + //ret=SSL_read(ci->ssl_comm, ci->read_buf + ci->read_pos, PICA_CONNREADBUFSIZE - ci->read_pos); if (PICA_CONNSTATE_CONNECTING == ci->state) ret = PICA_read_socket(ci->sck_comm, ci->read_buf, &ci->read_pos, PICA_CONNREADBUFSIZE); @@ -2006,7 +2097,7 @@ SSL_shutdown(cid->ssl_comm); SSL_free(cid->ssl_comm); SHUTDOWN(cid->sck_comm); CLOSE(cid->sck_comm); -SSL_CTX_free(cid->ctx); + free(cid->read_buf); if (cid->write_buf) @@ -2015,6 +2106,11 @@ if (cid->write_buf) free(cid); } +void PICA_close_acc(struct PICA_acc *a) +{ +SSL_CTX_free(a->ctx); +} + #ifdef WIN32 const char *PICA_inet_ntop(int af, const void *src, char *dst, size_t size) { -- cgit v1.2.1 From a32462dd698ebf58615a5fed3af5b50c28df9fce Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 16 Mar 2015 23:56:02 +0400 Subject: updated test client --- PICA_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 4b6f3a9..0f6460d 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -1257,7 +1257,7 @@ else } } -cid->state = PICA_CONNSTATE_WAITINGREP; +//cid->state = PICA_CONNSTATE_WAITINGREP; do { -- cgit v1.2.1 From 0a71ba2f66ce2a56d4ada62ef28bbb3f2ba7b991 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 30 Mar 2015 00:43:24 +0400 Subject: added missing free() call for PICA_acc struct in PICA_close_acc() --- PICA_client.c | 1 + 1 file changed, 1 insertion(+) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 0f6460d..286e163 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -2109,6 +2109,7 @@ free(cid); void PICA_close_acc(struct PICA_acc *a) { SSL_CTX_free(a->ctx); +free(a); } #ifdef WIN32 -- cgit v1.2.1 From 4c69b79f681490bcd71c86fc30f5e37300eb91f1 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 30 Mar 2015 03:53:09 +0400 Subject: implemented PICA_new_listener() and PICA_close_listener() --- PICA_client.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 286e163..12e3f68 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -1031,6 +1031,93 @@ RSA_free(rsa); return PICA_OK; } +// Opens socket to listen for incoming direct c2c connections bypassing nodes +// +// acc - pointer to opened account +// +// public_addr - DNS name or IP address string, +// it is an address that will be used for connecting from global Internet. +// Should be set to router's external IP if computer running pica-client is located behind the NAT. +// +// public_port - TCP port for incoming connections from global Internet +// +// local_port - TCP port that will be actually opened on computer listening for direct c2c connections +// +// l - address of pointer that will be filled with address of created PICA_listener structure +// +int PICA_new_listener(const struct PICA_acc *acc,const char *public_addr, int public_port, int local_port, struct PICA_listener **l) +{ + int ret, ret_err, flag; + struct PICA_listener *lst = NULL; + struct sockaddr_in s; + + + if (!acc || !public_addr || public_port <= 0 || public_port > 65535 || local_port <= 0 || local_port > 65535 || !l) + return PICA_ERRINVARG; + + lst = *l = (struct PICA_listener*)calloc(sizeof(struct PICA_listener), 1); + + if (!lst) + return PICA_ERRNOMEM; + + lst->public_addr_dns = strdup(public_addr); + + if (!lst->public_addr_dns) + return PICA_ERRNOMEM; + + lst->public_addr_ipv4 = inet_addr(public_addr); + + lst->acc = acc; + lst->public_port = public_port; + lst->local_port = local_port; + + lst->sck_listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); //(1) + + if (lst->sck_listener == SOCKET_ERROR) + { + ret_err = PICA_ERRSOCK; + goto error_ret_1; + } + + flag = 1; + setsockopt(lst->sck_listener, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag)); + + memset(&s, 0, sizeof(s)); + s.sin_family = AF_INET; + s.sin_addr.s_addr = INADDR_ANY; + s.sin_port = htons(local_port); + + ret = bind(lst->sck_listener, (const struct sockaddr*) &s, sizeof(s));//(2) + + if (ret == SOCKET_ERROR) + { + ret_err = PICA_ERRSOCK; + goto error_ret_2; + } + + ret = listen(lst->sck_listener, 10); + + if (ret == SOCKET_ERROR) + { + ret_err = PICA_ERRSOCK; + goto error_ret_2; + } + + return PICA_OK; + + error_ret_2: //(2) + + CLOSE(lst->sck_listener); + + error_ret_1: //(1) + + free(lst->public_addr_dns); + free(lst); + *l = 0; + + return ret_err; +} + int PICA_open_acc(const char *cert_file, const char *pkey_file, const char *dh_param_file, @@ -2112,6 +2199,13 @@ SSL_CTX_free(a->ctx); free(a); } +void PICA_close_listener(struct PICA_listener *l) +{ +CLOSE(l->sck_listener); +free(l->public_addr_dns); +free(l); +} + #ifdef WIN32 const char *PICA_inet_ntop(int af, const void *src, char *dst, size_t size) { -- cgit v1.2.1 From 51a859fd5d177a49290ec84153d943e3448d7b1b Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 6 Apr 2015 02:19:07 +0400 Subject: implementing PICA_event_loop(), created enums for c2n and c2c states --- PICA_client.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 5 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 12e3f68..4e2bcdd 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -1462,8 +1462,69 @@ mp = c2n_writebuf_push( ci, PICA_PROTO_CONNREQOUTG, PICA_PROTO_CONNREQOUTG_SIZE) return PICA_OK; } -int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listeners) +static void fdset_add(fd_set *fds, int fd, int *max) { +FD_SET(fd, fds); + +if (fd > *max) + *max = fd; +} + +int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listeners, int timeout) +{ +fd_set rfds, wfds; +struct timeval tv; +int ret, nfds = 0; +struct PICA_c2n **ic2n; +struct PICA_listener **ilst; + +tv.tv_sec = timeout / 1000; +tv.tv_usec = (timeout % 1000) * 1000; + +FD_ZERO(&rfds); +FD_ZERO(&wfds); + +ilst = listeners; + +while(ilst && *ilst) + { + fdset_add(&rfds, (*ilst)->sck_listener, &nfds); + ilst++; + } + +ic2n = connections; + +while(ic2n && *ic2n) + { + struct PICA_c2c *ic2c; + + fdset_add(&rfds, (*ic2n)->sck_comm, &nfds); + + if ((*ic2n)->write_pos) + fdset_add(&wfds, (*ic2n)->sck_comm, &nfds); + + ic2c = (*ic2n)->chan_list_head; + + while(ic2c) + { + if (ic2c->state == PICA_CHANSTATE_ACTIVE) + { + fdset_add(&rfds, ic2c->sck_data, &nfds); + + if (ic2c->write_pos) + fdset_add(&wfds, ic2c->sck_data, &nfds); + } + + ic2c = ic2c->next; + } + + ic2n++; + } + + + +ret = select(nfds + 1, &rfds, &wfds, NULL, &tv); + } @@ -1787,10 +1848,6 @@ int PICA_read_c2n(struct PICA_c2n *ci) { int ret; -switch(ci->state) -{ -//<<< -} //ret=SSL_read(ci->ssl_comm, ci->read_buf + ci->read_pos, PICA_CONNREADBUFSIZE - ci->read_pos); if (PICA_CONNSTATE_CONNECTING == ci->state) -- cgit v1.2.1 From 0672d6c3a65dc6246a5e17caa92c1bf2fdf7136b Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 9 Apr 2015 01:29:34 +0400 Subject: implementation of PICA_event_loop(), work in progress --- PICA_client.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 4e2bcdd..c7eeabf 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -1462,6 +1462,25 @@ mp = c2n_writebuf_push( ci, PICA_PROTO_CONNREQOUTG, PICA_PROTO_CONNREQOUTG_SIZE) return PICA_OK; } +static int process_c2n(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) +{ + +} + +static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) +{ +//if (ic2c->state == PICA_CHANSTATE_ACTIVE) +// { +// +// } + +} + +static int process_listener(struct PICA_listener *lst, fd_set *rfds) +{ + +} + static void fdset_add(fd_set *fds, int fd, int *max) { FD_SET(fd, fds); @@ -1522,10 +1541,59 @@ while(ic2n && *ic2n) } - ret = select(nfds + 1, &rfds, &wfds, NULL, &tv); +if (ret == 0) + return PICA_OK; + +if (ret == -1) + { +#ifndef WIN32 + if (errno == EINTR) + return PICA_OK; + else + return PICA_ERRSOCK; +#else +#warning "implement handling of select() errors on Windows!" +#endif + } + +//processing listeners, c2n and c2c connections + +ilst = listeners; +while(ilst && *ilst) + { + ret = process_listener(*ilst, &rfds); + + if (ret != PICA_OK) + return ret; + + ilst++; + } + +while(ic2n && *ic2n) + { + struct PICA_c2c *ic2c; + + //processing current c2n + + ret = process_c2n(*ic2n, &rfds, &wfds); + + ic2c = (*ic2n)->chan_list_head; + + //processing c2c connections associated with current c2n + while(ic2c) + { + ret = process_c2c(ic2c, &rfds, &wfds); + + ic2c = ic2c->next; + } + + ic2n++; + } + +return PICA_OK; } int PICA_read(struct PICA_c2n *ci,int timeout) -- cgit v1.2.1 From ec751f3f1260b72ade3a9fcb2dae5b55a6854fa9 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 11 Apr 2015 23:34:46 +0400 Subject: more consistent naming, renamed conn -> c2n, channel -> c2c in function names and enumerations --- PICA_client.c | 95 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 45 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index c7eeabf..5433a4e 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -388,7 +388,7 @@ if (callbacks.peer_cert_verify_cb(chnl->peer_id, (const char*)cert_pem, cert_pem BIO_free(mem); } -chnl->state=PICA_CHANSTATE_ACTIVE; +chnl->state=PICA_C2C_STATE_ACTIVE; { unsigned long arg = 1; @@ -400,8 +400,8 @@ return PICA_OK; error_ret_: error_ret: -callbacks.channel_failed(chnl->peer_id); -PICA_close_channel(chnl); +callbacks.c2c_failed(chnl->peer_id); +PICA_close_c2c(chnl); return err_ret; } @@ -471,7 +471,7 @@ unsigned char *peer_id = buf + 2; if (ret!=PICA_OK) return 1; - callbacks.channel_established_cb(_chnl->peer_id);//*nchn=_chnl; + callbacks.c2c_established_cb(_chnl->peer_id);//*nchn=_chnl; return 1; } @@ -512,7 +512,7 @@ if (!rq) return 0;// ERR_CHECK -левое сообщение, такой запрос не посылался //puts("procmsg_NOTFOUND_chkp0");//debug -PICA_close_channel(rq); +PICA_close_c2c(rq); //puts("procmsg_NOTFOUND_chkp1");//debug @@ -546,7 +546,7 @@ ret=establish_data_connection(rq); if (ret!=PICA_OK) return 0; -callbacks.channel_established_cb(rq->peer_id);//*nchn=_chnl; +callbacks.c2c_established_cb(rq->peer_id);//*nchn=_chnl; return 1; } @@ -1239,7 +1239,7 @@ return ret_err; //PICA_OK - успешное завершение функции //.... -int PICA_new_connection(const struct PICA_acc *acc, const char *nodeaddr, +int PICA_new_c2n(const struct PICA_acc *acc, const char *nodeaddr, unsigned int port, struct PICA_c2n **ci) { @@ -1315,7 +1315,7 @@ if (cid->sck_comm==SOCKET_ERROR) goto error_ret_3; } -cid->state = PICA_CONNSTATE_CONNECTING; +cid->state = PICA_C2N_STATE_CONNECTING; ret=connect(cid->sck_comm,(struct sockaddr*)&a,sizeof(struct sockaddr_in)); /////////////////state_ @@ -1344,7 +1344,7 @@ else } } -//cid->state = PICA_CONNSTATE_WAITINGREP; +//cid->state = PICA_C2N_STATE_WAITINGREP; do { @@ -1385,7 +1385,7 @@ ret=SSL_set_fd(cid->ssl_comm,cid->sck_comm); ret=SSL_accept(cid->ssl_comm); /////////////////state_ -cid->state = PICA_CONNSTATE_WAITINGTLS; +cid->state = PICA_C2N_STATE_WAITINGTLS; if (ret!=1) { //printf("SSL_accept ret=%i\n SSL_get_error=%i\n",ret,SSL_get_error(cid->ssl_comm,ret));//debug @@ -1393,7 +1393,7 @@ if (ret!=1) ret_err=PICA_ERRSSL; goto error_ret_4; } -cid->state = PICA_CONNSTATE_CONNECTED;//<<state = PICA_C2N_STATE_CONNECTED;//<<state) +// { +// case PICA_C2N_STATE_CONNECTED: +// } +return PICA_OK; } static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) { -//if (ic2c->state == PICA_CHANSTATE_ACTIVE) +//if (ic2c->state == PICA_C2C_STATE_ACTIVE) // { // // } - +return PICA_OK; } static int process_listener(struct PICA_listener *lst, fd_set *rfds) { - +return PICA_OK; } static void fdset_add(fd_set *fds, int fd, int *max) @@ -1526,7 +1531,7 @@ while(ic2n && *ic2n) while(ic2c) { - if (ic2c->state == PICA_CHANSTATE_ACTIVE) + if (ic2c->state == PICA_C2C_STATE_ACTIVE) { fdset_add(&rfds, ic2c->sck_data, &nfds); @@ -1616,7 +1621,7 @@ ipt=ci->chan_list_head; while(ipt) { - if (ipt->state==PICA_CHANSTATE_ACTIVE) + if (ipt->state==PICA_C2C_STATE_ACTIVE) { FD_SET(ipt->sck_data,&fds); @@ -1624,7 +1629,7 @@ while(ipt) nfds=ipt->sck_data; } - if (ipt->state != PICA_CHANSTATE_ACTIVE && (time(0) - ipt->timestamp) > PICA_CHAN_ACTIVATE_TIMEOUT) + if (ipt->state != PICA_C2C_STATE_ACTIVE && (time(0) - ipt->timestamp) > PICA_CHAN_ACTIVATE_TIMEOUT) { kill_ptr = ipt; } @@ -1633,7 +1638,7 @@ while(ipt) if (kill_ptr) { - PICA_close_channel(kill_ptr); + PICA_close_c2c(kill_ptr); kill_ptr = 0; } } @@ -1655,12 +1660,12 @@ if (ret>0) ipt=ci->chan_list_head; while(ipt) { - if (ipt->state==PICA_CHANSTATE_ACTIVE && FD_ISSET(ipt->sck_data, &fds)) + if (ipt->state==PICA_C2C_STATE_ACTIVE && FD_ISSET(ipt->sck_data, &fds)) { if (PICA_OK != (ret = PICA_read_c2c(ipt)) ) { puts("PICA_read_c2c() failed");//debug - callbacks.channel_closed_cb(ipt->peer_id, ret); + callbacks.c2c_closed_cb(ipt->peer_id, ret); kill_ptr = ipt; } @@ -1670,7 +1675,7 @@ if (ret>0) if (kill_ptr) { - PICA_close_channel(kill_ptr); + PICA_close_c2c(kill_ptr); kill_ptr = 0; } } @@ -1703,7 +1708,7 @@ while(ipt) if (PICA_OK != (ret = PICA_write_c2c(ipt))) { fprintf(stderr,"PICA_write_c2c() failed, ret = %i\n", ret);//debug - callbacks.channel_closed_cb(ipt->peer_id, ret); + callbacks.c2c_closed_cb(ipt->peer_id, ret); kill_ptr = ipt; } } @@ -1711,7 +1716,7 @@ while(ipt) { if (PICA_OK != (ret = PICA_send_file_fragment(ipt))) { - callbacks.channel_closed_cb(ipt->peer_id, ret); + callbacks.c2c_closed_cb(ipt->peer_id, ret); kill_ptr = ipt; } } @@ -1719,7 +1724,7 @@ while(ipt) if (kill_ptr) { - PICA_close_channel(kill_ptr); + PICA_close_c2c(kill_ptr); kill_ptr = 0; } } @@ -1800,9 +1805,9 @@ int PICA_write_c2n(struct PICA_c2n *ci) { int ret = PICA_ERRINVARG; -if (PICA_CONNSTATE_CONNECTING == ci->state) +if (PICA_C2N_STATE_CONNECTING == ci->state) ret = PICA_write_socket( ci->sck_comm, ci->write_buf, &ci->write_pos); -else if (PICA_CONNSTATE_CONNECTED == ci->state) +else if (PICA_C2N_STATE_CONNECTED == ci->state) ret = PICA_write_ssl( ci->ssl_comm, ci->write_buf, &ci->write_pos, &ci->write_sslbytestowrite); return ret; @@ -1812,7 +1817,7 @@ int PICA_write_c2c(struct PICA_c2c *chn) { int ret = PICA_ERRINVARG; -if (PICA_CHANSTATE_ACTIVE != chn->state) +if (PICA_C2C_STATE_ACTIVE != chn->state) ret = PICA_write_socket( chn->sck_data, chn->write_buf, &chn->write_pos); else ret = PICA_write_ssl( chn->ssl, chn->write_buf, &chn->write_pos, &chn->write_sslbytestowrite); @@ -1896,7 +1901,7 @@ int PICA_read_c2c(struct PICA_c2c *chn) { int ret; -if (chn->state != PICA_CHANSTATE_ACTIVE) +if (chn->state != PICA_C2C_STATE_ACTIVE) return PICA_OK;// ??? //ret = SSL_read(chn->ssl , chn->read_buf + chn->read_pos, PICA_CHANREADBUFSIZE - chn->read_pos); @@ -1918,20 +1923,20 @@ int ret; //ret=SSL_read(ci->ssl_comm, ci->read_buf + ci->read_pos, PICA_CONNREADBUFSIZE - ci->read_pos); -if (PICA_CONNSTATE_CONNECTING == ci->state) +if (PICA_C2N_STATE_CONNECTING == ci->state) ret = PICA_read_socket(ci->sck_comm, ci->read_buf, &ci->read_pos, PICA_CONNREADBUFSIZE); -else if (PICA_CONNSTATE_CONNECTED == ci->state) +else if (PICA_C2N_STATE_CONNECTED == ci->state) ret = PICA_read_ssl(ci->ssl_comm, ci->read_buf, &ci->read_pos, PICA_CONNREADBUFSIZE); if (ret == PICA_OK) { - if (PICA_CONNSTATE_CONNECTING == ci->state) + if (PICA_C2N_STATE_CONNECTING == ci->state) if(!PICA_processdatastream( ci->read_buf, &(ci->read_pos), ci, c2n_init_messages, MSGINFO_MSGSNUM(c2n_init_messages))) return PICA_ERRSERV; - if (PICA_CONNSTATE_CONNECTED == ci->state) + if (PICA_C2N_STATE_CONNECTED == ci->state) if(!PICA_processdatastream( ci->read_buf, &(ci->read_pos), ci, c2n_messages, MSGINFO_MSGSNUM(c2n_messages))) return PICA_ERRSERV; } @@ -2232,14 +2237,14 @@ if (chn->sendfile_pos > chn->sendfile_size) return PICA_OK; } -void PICA_close_channel(struct PICA_c2c *chn) +void PICA_close_c2c(struct PICA_c2c *chn) { struct PICA_c2c *ipt; -fprintf(stderr, "PICA_close_channel(%p)\n", chn);//debug +fprintf(stderr, "PICA_close_c2c(%p)\n", chn);//debug ipt=chn->conn->chan_list_head; -//puts("PICA_close_channel_chkp0");//debug +//puts("PICA_close_c2c_chkp0");//debug while(ipt) { if (ipt==chn) @@ -2259,7 +2264,7 @@ while(ipt) ipt=ipt->next; } -//puts("PICA_close_channel_chkp1");//debug +//puts("PICA_close_c2c_chkp1");//debug if (chn -> sendfile_stream) fclose(chn -> sendfile_stream); @@ -2276,11 +2281,11 @@ if (chn -> write_buf) if (chn->peer_cert) X509_free(chn->peer_cert); -//puts("PICA_close_channel_chkp2");//debug +//puts("PICA_close_c2c_chkp2");//debug if (chn->ssl) SSL_shutdown(chn->ssl); - //puts("PICA_close_channel_chkp3");//debug + //puts("PICA_close_c2c_chkp3");//debug if (chn->ssl) { @@ -2288,13 +2293,13 @@ if (chn->ssl) SSL_free(chn->ssl); } -//puts("PICA_close_channel_chkp4");//debug +//puts("PICA_close_c2c_chkp4");//debug SHUTDOWN(chn->sck_data); -//puts("PICA_close_channel_chkp5");//debug +//puts("PICA_close_c2c_chkp5");//debug CLOSE(chn->sck_data); -//puts("PICA_close_channel_chkp6");//debug +//puts("PICA_close_c2c_chkp6");//debug free(chn); -//puts("PICA_close_channel_chkp7");//debug +//puts("PICA_close_c2c_chkp7");//debug } void PICA_close_connection(struct PICA_c2n *cid) @@ -2302,7 +2307,7 @@ void PICA_close_connection(struct PICA_c2n *cid) struct PICA_c2c *ipt; while((ipt = cid->chan_list_head)) - PICA_close_channel(ipt); + PICA_close_c2c(ipt); SSL_shutdown(cid->ssl_comm); //printf("4 SSL_free(%X)\n",cid->ssl_comm);//debug -- cgit v1.2.1 From 55b17bd87fc0d695500574b188534014922cb2a4 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 11 Apr 2015 23:54:35 +0400 Subject: renamed remaining PICA_close_connection() -> PICA_close_c2n() --- PICA_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 5433a4e..c10ca1d 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -1234,7 +1234,7 @@ return ret_err; //pkey_file - имя файла, содержащего приватный ключ в формате PEM //password_cb - callback-функция, запрашивающая пароль к приватному ключу, см. man 3 SSL_CTX_set_default_passwd_cb;в userdata передается указатель на id //ci -указатель на указатель на структуру PICA_c2n, который будет проинициализирован при успешном выполнении функции -//Память, выделенная под структуру, освобождается при вызове PICA_close_connection +//Память, выделенная под структуру, освобождается при вызове PICA_close_c2n //Возвращаемое значение - код завершения //PICA_OK - успешное завершение функции //.... @@ -2302,7 +2302,7 @@ free(chn); //puts("PICA_close_c2c_chkp7");//debug } -void PICA_close_connection(struct PICA_c2n *cid) +void PICA_close_c2n(struct PICA_c2n *cid) { struct PICA_c2c *ipt; -- cgit v1.2.1 From 9147cd24d5b749d9e74ad308fb059f79c7abf115 Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 15 Apr 2015 02:05:07 +0400 Subject: callback for listener error notification --- PICA_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index c10ca1d..1f52e5c 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -1572,7 +1572,7 @@ while(ilst && *ilst) ret = process_listener(*ilst, &rfds); if (ret != PICA_OK) - return ret; + callbacks.listener_error(*ilst, ret); ilst++; } -- cgit v1.2.1 From 30b06d7d978120561f617271c0597763b864c934 Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 15 Apr 2015 02:17:43 +0400 Subject: PICA_event_loop() implementation, mostly completed --- PICA_client.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 1f52e5c..141d35c 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -1585,16 +1585,33 @@ while(ic2n && *ic2n) ret = process_c2n(*ic2n, &rfds, &wfds); - ic2c = (*ic2n)->chan_list_head; - - //processing c2c connections associated with current c2n - while(ic2c) + if (ret != PICA_OK) { - ret = process_c2c(ic2c, &rfds, &wfds); - - ic2c = ic2c->next; + PICA_close_c2n(*ic2n); } + else + { + struct PICA_c2c *kill_ptr = 0; + ic2c = (*ic2n)->chan_list_head; + + //processing c2c connections associated with current c2n + while(ic2c) + { + ret = process_c2c(ic2c, &rfds, &wfds); + + if (ret != PICA_OK) + kill_ptr = ic2c; + + ic2c = ic2c->next; + + if (kill_ptr) + { + PICA_close_c2c(kill_ptr); + kill_ptr = 0; + } + } + } ic2n++; } -- cgit v1.2.1 From f4f8d75ca055e3b53549cb0e23ef41c51620b699 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 11 May 2015 02:50:03 +0400 Subject: implemented asynchronous processing of c2n connections --- PICA_client.c | 253 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 209 insertions(+), 44 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 141d35c..29b6955 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -390,11 +390,8 @@ BIO_free(mem); chnl->state=PICA_C2C_STATE_ACTIVE; -{ -unsigned long arg = 1; +IOCTLSETNONBLOCKINGSOCKET(chnl->sck_data, 1); -IOCTLSETNONBLOCKINGSOCKET(chnl->sck_data, &arg); -} return PICA_OK; @@ -1223,6 +1220,74 @@ free(a); return ret_err; } +static int c2n_stage2_sendreq(struct PICA_c2n *c2n) +{ +struct PICA_proto_msg *mp; + +puts("c2n_stage2_sendreq");//debug + +mp = c2n_writebuf_push(c2n, PICA_PROTO_INITREQ, PICA_PROTO_INITREQ_SIZE); + +if (mp) + { + mp->tail[0] = PICA_PROTO_VER_HIGH; + mp->tail[1] = PICA_PROTO_VER_LOW; + } +else + return PICA_ERRNOMEM; + +c2n->state = PICA_C2N_STATE_WAITINGREP; + +return PICA_OK; +} + +static int c2n_stage3_starttls(struct PICA_c2n *c2n) +{ +int ret; + +ret = SSL_set_fd(c2n->ssl_comm, c2n->sck_comm); + +if (ret != 1) + return PICA_ERRSSL; + +ret = SSL_accept(c2n->ssl_comm); + +if (ret == 0) + return PICA_ERRSSL; + +if (ret < 0) + { + ret = SSL_get_error(c2n->ssl_comm, ret); + + if (ret != SSL_ERROR_WANT_READ && ret != SSL_ERROR_WANT_WRITE) + return PICA_ERRSSL; + } + +c2n->state = PICA_C2N_STATE_WAITINGTLS; + +return PICA_OK; +} + +static int c2n_stage4_nodelistrequest(struct PICA_c2n *c2n) +{ +struct PICA_proto_msg *mp; + +mp = c2n_writebuf_push(c2n, PICA_PROTO_CLNODELISTREQ, PICA_PROTO_CLNODELISTREQ_SIZE); + +if (mp) + { + RAND_bytes(mp->tail, 2); + } +else + return PICA_ERRNOMEM; + +c2n->state = PICA_C2N_STATE_CONNECTED; + +callbacks.c2n_established_cb(c2n); + +return PICA_OK; +} + /*адрес сервера, сертификат клиента и закрытый ключ*/ //Осуществляет подключение к серверу по указанному адресу. @@ -1315,37 +1380,33 @@ if (cid->sck_comm==SOCKET_ERROR) goto error_ret_3; } +IOCTLSETNONBLOCKINGSOCKET(cid->sck_comm, 1); + cid->state = PICA_C2N_STATE_CONNECTING; -ret=connect(cid->sck_comm,(struct sockaddr*)&a,sizeof(struct sockaddr_in)); +ret=connect(cid->sck_comm,(struct sockaddr*)&cid->srv_addr,sizeof(cid->srv_addr)); /////////////////state_ +if (ret == 0) + return c2n_stage2_sendreq(cid); + if (ret==SOCKET_ERROR) { +#ifndef WIN32 + if (errno == EINPROGRESS || errno == EINTR) + return PICA_OK; +#else + if (WSAGetLastError() == WSAEWOULDBLOCK) + return PICA_OK; +#endif + ret_err=PICA_ERRSOCK; goto error_ret_4; } -{ -struct PICA_proto_msg *mp; - -mp = c2n_writebuf_push( cid, PICA_PROTO_INITREQ, PICA_PROTO_INITREQ_SIZE); - -if (mp) - { - mp->tail[0] = PICA_PROTO_VER_HIGH; - mp->tail[1] = PICA_PROTO_VER_LOW; - } -else - { - ret_err = PICA_ERRNOMEM; - goto error_ret_4; - } -} - -//cid->state = PICA_C2N_STATE_WAITINGREP; +/* do { ret = PICA_write_c2n(cid); @@ -1378,7 +1439,7 @@ if (cid->init_resp_ok != 1) } //printf("6\n");//debug - +*/ /* ret=SSL_set_fd(cid->ssl_comm,cid->sck_comm); //printf("SSL_set_fd=%i\n",ret); @@ -1392,7 +1453,7 @@ if (ret!=1) //ERR_CHECK ret_err=PICA_ERRSSL; goto error_ret_4; - } + }*/ /* cid->state = PICA_C2N_STATE_CONNECTED;//<<tail, 2); } } - -{ -unsigned long arg = 1; - -IOCTLSETNONBLOCKINGSOCKET(cid->sck_comm, &arg); -} +*/ return PICA_OK; @@ -1464,12 +1520,107 @@ return PICA_OK; static int process_c2n(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) { -//switch(c2n->state) -// { -// case PICA_C2N_STATE_CONNECTED: -// } +int ret = PICA_OK; -return PICA_OK; +//puts("process_c2n()");//debug + +switch(c2n->state) + { + case PICA_C2N_STATE_NEW: + break; + + case PICA_C2N_STATE_CONNECTING: + + if (FD_ISSET(c2n->sck_comm, wfds)) + { + ret = PICA_ERRSOCK; + + //check if connect() finished successfully +#ifndef WIN32 + int optval; + socklen_t optlen = sizeof(optval); + + if (0 == getsockopt(c2n->sck_comm, SOL_SOCKET, SO_ERROR, &optval, &optlen)) + { + if (optval == 0) + { + ret = c2n_stage2_sendreq(c2n); + } + } +#else + if (SOCKET_ERROR == connect(c2n->ssl_comm, (struct sockaddr*)&c2n->srv_addr, sizeof(c2n->srv_addr)) && + WSAEISCONN == WSAGetLastError()) + { + ret = c2n_stage2_sendreq(c2n); + } +#endif + } + + break; + + case PICA_C2N_STATE_WAITINGREP: + + if (FD_ISSET(c2n->sck_comm, wfds)) + { + ret = PICA_write_c2n(c2n); + } + + if (FD_ISSET(c2n->sck_comm, rfds)) + { + ret = PICA_read_c2n(c2n); + } + + if (ret == PICA_OK && c2n->init_resp_ok != 0) + { + if (c2n->init_resp_ok == 1) + ret = c2n_stage3_starttls(c2n); + else + { + if (c2n->node_ver_major > PICA_PROTO_VER_HIGH || + (c2n->node_ver_major == PICA_PROTO_VER_HIGH && c2n->node_ver_minor > PICA_PROTO_VER_LOW)) + ret = PICA_ERRPROTONEW; + else + ret = PICA_ERRPROTOOLD; + } + } + + break; + + case PICA_C2N_STATE_WAITINGTLS: + + if (FD_ISSET(c2n->sck_comm, wfds) || FD_ISSET(c2n->sck_comm, rfds)) + { + int sslret; + + sslret = SSL_accept(c2n->ssl_comm); + + if (sslret == 1) + ret = c2n_stage4_nodelistrequest(c2n); + else if (sslret == 0) + ret = PICA_ERRSSL; + else if (sslret < 0) + { + sslret = SSL_get_error(c2n->ssl_comm, sslret); + + if (sslret != SSL_ERROR_WANT_READ && sslret != SSL_ERROR_WANT_WRITE) + ret = PICA_ERRSSL; + } + } + + break; + + case PICA_C2N_STATE_CONNECTED: + + if (FD_ISSET(c2n->sck_comm, wfds)) + ret = PICA_write_c2n(c2n); + + if (FD_ISSET(c2n->sck_comm, rfds)) + ret = PICA_read_c2n(c2n); + + break; + } + +return ret; } static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) @@ -1502,6 +1653,8 @@ int ret, nfds = 0; struct PICA_c2n **ic2n; struct PICA_listener **ilst; +//puts("PICA_event_loop");//debug + tv.tv_sec = timeout / 1000; tv.tv_usec = (timeout % 1000) * 1000; @@ -1522,9 +1675,12 @@ while(ic2n && *ic2n) { struct PICA_c2c *ic2c; + //printf("event_loop: adding c2n %p\n", *ic2n);//debug + fdset_add(&rfds, (*ic2n)->sck_comm, &nfds); - if ((*ic2n)->write_pos) + if ((*ic2n)->write_pos || (*ic2n)->state == PICA_C2N_STATE_CONNECTING + || (*ic2n)->state == PICA_C2N_STATE_WAITINGTLS) fdset_add(&wfds, (*ic2n)->sck_comm, &nfds); ic2c = (*ic2n)->chan_list_head; @@ -1535,7 +1691,7 @@ while(ic2n && *ic2n) { fdset_add(&rfds, ic2c->sck_data, &nfds); - if (ic2c->write_pos) + if (ic2c->write_pos || ic2c->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) fdset_add(&wfds, ic2c->sck_data, &nfds); } @@ -1548,9 +1704,6 @@ while(ic2n && *ic2n) ret = select(nfds + 1, &rfds, &wfds, NULL, &tv); -if (ret == 0) - return PICA_OK; - if (ret == -1) { #ifndef WIN32 @@ -1563,6 +1716,8 @@ if (ret == -1) #endif } +//printf("select() returned %i\n", ret);//debug + //processing listeners, c2n and c2c connections ilst = listeners; @@ -1572,11 +1727,16 @@ while(ilst && *ilst) ret = process_listener(*ilst, &rfds); if (ret != PICA_OK) + { callbacks.listener_error(*ilst, ret); + PICA_close_listener(*ilst); + } ilst++; } +ic2n = connections; + while(ic2n && *ic2n) { struct PICA_c2c *ic2c; @@ -1587,6 +1747,11 @@ while(ic2n && *ic2n) if (ret != PICA_OK) { + if ((*ic2n)->state == PICA_C2N_STATE_CONNECTED) + callbacks.c2n_closed_cb(*ic2n); + else + callbacks.c2n_failed_cb(*ic2n); + PICA_close_c2n(*ic2n); } else @@ -1822,7 +1987,7 @@ int PICA_write_c2n(struct PICA_c2n *ci) { int ret = PICA_ERRINVARG; -if (PICA_C2N_STATE_CONNECTING == ci->state) +if (PICA_C2N_STATE_WAITINGREP == ci->state) ret = PICA_write_socket( ci->sck_comm, ci->write_buf, &ci->write_pos); else if (PICA_C2N_STATE_CONNECTED == ci->state) ret = PICA_write_ssl( ci->ssl_comm, ci->write_buf, &ci->write_pos, &ci->write_sslbytestowrite); @@ -1940,7 +2105,7 @@ int ret; //ret=SSL_read(ci->ssl_comm, ci->read_buf + ci->read_pos, PICA_CONNREADBUFSIZE - ci->read_pos); -if (PICA_C2N_STATE_CONNECTING == ci->state) +if (PICA_C2N_STATE_WAITINGREP == ci->state) ret = PICA_read_socket(ci->sck_comm, ci->read_buf, &ci->read_pos, PICA_CONNREADBUFSIZE); else if (PICA_C2N_STATE_CONNECTED == ci->state) ret = PICA_read_ssl(ci->ssl_comm, ci->read_buf, &ci->read_pos, PICA_CONNREADBUFSIZE); @@ -1949,7 +2114,7 @@ else if (PICA_C2N_STATE_CONNECTED == ci->state) if (ret == PICA_OK) { - if (PICA_C2N_STATE_CONNECTING == ci->state) + if (PICA_C2N_STATE_WAITINGREP == ci->state) if(!PICA_processdatastream( ci->read_buf, &(ci->read_pos), ci, c2n_init_messages, MSGINFO_MSGSNUM(c2n_init_messages))) return PICA_ERRSERV; -- cgit v1.2.1 From ef3dd94a729da287aec1744d9135d522550d83f9 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 25 May 2015 21:07:46 +0400 Subject: generate new DH key on each handshake --- PICA_client.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 29b6955..979d274 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -1159,6 +1159,8 @@ if (1 != SSL_CTX_set_tmp_dh(a->ctx, dh)) DH_free(dh); +SSL_CTX_set_options(a->ctx, SSL_OP_SINGLE_DH_USE); + if (!PICA_get_id_from_cert_file(cert_file, a->id)) { ret_err = PICA_ERRINVCERT; -- cgit v1.2.1 From d56c7301b718754c7ec6b2baad603ff001d5a46a Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 7 Apr 2016 20:38:23 +0400 Subject: added skeleton of procmsg_C2CCONNREQ() - PICA_PROTO_C2CCONNREQ packet handler --- PICA_client.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 979d274..94ef553 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -47,6 +47,7 @@ static unsigned int procmsg_DENIEDFILE(unsigned char*,unsigned int,void*); static unsigned int procmsg_FILEFRAGMENT(unsigned char*,unsigned int,void*); static unsigned int procmsg_FILECONTROL(unsigned char*,unsigned int,void*); static unsigned int procmsg_INITRESP_c2c(unsigned char*,unsigned int,void*); +static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb,void* p); static struct PICA_proto_msg* c2n_writebuf_push(struct PICA_c2n *ci, unsigned int msgid, unsigned int size); static struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned int msgid, unsigned int size); @@ -76,6 +77,7 @@ struct PICA_msginfo c2n_init_messages[] = { }; struct PICA_msginfo c2c_init_messages[] = { + {PICA_PROTO_C2CCONNREQ, PICA_MSG_FIXED_SIZE,PICA_PROTO_C2CCONNREQ_SIZE, procmsg_C2CCONNREQ}, {PICA_PROTO_INITRESPOK, PICA_MSG_FIXED_SIZE, PICA_PROTO_INITRESPOK_SIZE, procmsg_INITRESP_c2c}, {PICA_PROTO_VERDIFFER, PICA_MSG_FIXED_SIZE, PICA_PROTO_VERDIFFER_SIZE, procmsg_INITRESP_c2c} }; @@ -402,6 +404,22 @@ PICA_close_c2c(chnl); return err_ret; } +static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb,void* p) +{ +struct PICA_c2c *cc=(struct PICA_c2n *)p; + +if (buf[2] == PICA_C2CPROTO_VER_HIGH && buf[3] == PICA_C2CPROTO_VER_LOW) + { + //send ok + } +else + { + //send verdiffer, disconnect after sending + } + +return 1; +} + static unsigned int procmsg_INITRESP_c2c(unsigned char* buf, unsigned int nb,void* p) { } -- cgit v1.2.1 From fff351c20da3294f9f8d13d94660fea099093738 Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 7 Apr 2016 21:17:57 +0400 Subject: fixed code style using "astyle --style=allman --lineend=linux --indent=tab --pad-oper *.c *.h" --- PICA_client.c | 2996 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 1501 insertions(+), 1495 deletions(-) mode change 100755 => 100644 PICA_client.c (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c old mode 100755 new mode 100644 index 94ef553..0d728f4 --- a/PICA_client.c +++ b/PICA_client.c @@ -33,27 +33,28 @@ static int PICA_sendfile_open_read(struct PICA_c2c *chn, const char *filename_ut static int PICA_recvfile_open_write(struct PICA_c2c *chn, const char *filename_utf8, unsigned int filenamesize); static int PICA_send_filecontrol(struct PICA_c2c *chan, int senderctl, int receiverctl); -static unsigned int procmsg_INITRESP(unsigned char*,unsigned int,void*); -static unsigned int procmsg_CONNREQINC(unsigned char*,unsigned int,void*); -static unsigned int procmsg_NOTFOUND(unsigned char*,unsigned int,void*); -static unsigned int procmsg_FOUND(unsigned char*,unsigned int,void*); -static unsigned int procmsg_CLNODELIST(unsigned char*,unsigned int,void*); -static unsigned int procmsg_MSGUTF8(unsigned char*,unsigned int,void*); -static unsigned int procmsg_MSGOK(unsigned char*,unsigned int,void*); -static unsigned int procmsg_PINGREQ(unsigned char*,unsigned int,void*); -static unsigned int procmsg_SENDFILEREQUEST(unsigned char*,unsigned int,void*); -static unsigned int procmsg_ACCEPTEDFILE(unsigned char*,unsigned int,void*); -static unsigned int procmsg_DENIEDFILE(unsigned char*,unsigned int,void*); -static unsigned int procmsg_FILEFRAGMENT(unsigned char*,unsigned int,void*); -static unsigned int procmsg_FILECONTROL(unsigned char*,unsigned int,void*); -static unsigned int procmsg_INITRESP_c2c(unsigned char*,unsigned int,void*); -static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb,void* p); +static unsigned int procmsg_INITRESP(unsigned char*, unsigned int, void*); +static unsigned int procmsg_CONNREQINC(unsigned char*, unsigned int, void*); +static unsigned int procmsg_NOTFOUND(unsigned char*, unsigned int, void*); +static unsigned int procmsg_FOUND(unsigned char*, unsigned int, void*); +static unsigned int procmsg_CLNODELIST(unsigned char*, unsigned int, void*); +static unsigned int procmsg_MSGUTF8(unsigned char*, unsigned int, void*); +static unsigned int procmsg_MSGOK(unsigned char*, unsigned int, void*); +static unsigned int procmsg_PINGREQ(unsigned char*, unsigned int, void*); +static unsigned int procmsg_SENDFILEREQUEST(unsigned char*, unsigned int, void*); +static unsigned int procmsg_ACCEPTEDFILE(unsigned char*, unsigned int, void*); +static unsigned int procmsg_DENIEDFILE(unsigned char*, unsigned int, void*); +static unsigned int procmsg_FILEFRAGMENT(unsigned char*, unsigned int, void*); +static unsigned int procmsg_FILECONTROL(unsigned char*, unsigned int, void*); +static unsigned int procmsg_INITRESP_c2c(unsigned char*, unsigned int, void*); +static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb, void* p); static struct PICA_proto_msg* c2n_writebuf_push(struct PICA_c2n *ci, unsigned int msgid, unsigned int size); static struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned int msgid, unsigned int size); #define MSGINFO_MSGSNUM(arr) (sizeof(arr)/sizeof(struct PICA_msginfo)) -const struct PICA_msginfo c2n_messages[] = { +const struct PICA_msginfo c2n_messages[] = +{ {PICA_PROTO_CONNREQINC, PICA_MSG_FIXED_SIZE, PICA_PROTO_CONNREQINC_SIZE, procmsg_CONNREQINC}, {PICA_PROTO_NOTFOUND, PICA_MSG_FIXED_SIZE, PICA_PROTO_NOTFOUND_SIZE, procmsg_NOTFOUND}, {PICA_PROTO_FOUND, PICA_MSG_FIXED_SIZE, PICA_PROTO_FOUND_SIZE, procmsg_FOUND}, @@ -61,7 +62,8 @@ const struct PICA_msginfo c2n_messages[] = { {PICA_PROTO_PINGREQ, PICA_MSG_FIXED_SIZE, PICA_PROTO_PINGREQ_SIZE, procmsg_PINGREQ} };//---!!! PING!!! -const struct PICA_msginfo c2c_messages[] = { +const struct PICA_msginfo c2c_messages[] = +{ {PICA_PROTO_MSGUTF8, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_MSGUTF8}, {PICA_PROTO_MSGOK, PICA_MSG_FIXED_SIZE, PICA_PROTO_MSGOK_SIZE, procmsg_MSGOK}, {PICA_PROTO_SENDFILEREQUEST, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_SENDFILEREQUEST}, @@ -71,13 +73,15 @@ const struct PICA_msginfo c2c_messages[] = { {PICA_PROTO_FILECONTROL, PICA_MSG_FIXED_SIZE, PICA_PROTO_FILECONTROL_SIZE, procmsg_FILECONTROL} }; -struct PICA_msginfo c2n_init_messages[] = { +struct PICA_msginfo c2n_init_messages[] = +{ {PICA_PROTO_INITRESPOK, PICA_MSG_FIXED_SIZE, PICA_PROTO_INITRESPOK_SIZE, procmsg_INITRESP}, {PICA_PROTO_VERDIFFER, PICA_MSG_FIXED_SIZE, PICA_PROTO_VERDIFFER_SIZE, procmsg_INITRESP} }; -struct PICA_msginfo c2c_init_messages[] = { - {PICA_PROTO_C2CCONNREQ, PICA_MSG_FIXED_SIZE,PICA_PROTO_C2CCONNREQ_SIZE, procmsg_C2CCONNREQ}, +struct PICA_msginfo c2c_init_messages[] = +{ + {PICA_PROTO_C2CCONNREQ, PICA_MSG_FIXED_SIZE, PICA_PROTO_C2CCONNREQ_SIZE, procmsg_C2CCONNREQ}, {PICA_PROTO_INITRESPOK, PICA_MSG_FIXED_SIZE, PICA_PROTO_INITRESPOK_SIZE, procmsg_INITRESP_c2c}, {PICA_PROTO_VERDIFFER, PICA_MSG_FIXED_SIZE, PICA_PROTO_VERDIFFER_SIZE, procmsg_INITRESP_c2c} }; @@ -123,809 +127,811 @@ return 1; int PICA_get_id_from_cert_file(const char *cert_file, unsigned char *id) { -X509 *x; -FILE *f; + X509 *x; + FILE *f; -f=fopen(cert_file,"r"); + f = fopen(cert_file, "r"); -if (!f) -{ - perror(cert_file); - return 0; -} + if (!f) + { + perror(cert_file); + return 0; + } -x=PEM_read_X509(f,0,0,0); -fclose(f); + x = PEM_read_X509(f, 0, 0, 0); + fclose(f); -if (!x) -{ - return 0; -} + if (!x) + { + return 0; + } -return PICA_id_from_X509(x, id); + return PICA_id_from_X509(x, id); } int PICA_get_id_from_cert_string(const char *cert_pem, unsigned char *id) { -X509 *x; -BIO *biomem; + X509 *x; + BIO *biomem; -biomem = BIO_new_mem_buf(cert_pem, -1); + biomem = BIO_new_mem_buf(cert_pem, -1); -x = PEM_read_bio_X509(biomem, NULL, 0, NULL); + x = PEM_read_bio_X509(biomem, NULL, 0, NULL); -if (!x) -{ - return 0; -} + if (!x) + { + return 0; + } -return PICA_id_from_X509(x, id); + return PICA_id_from_X509(x, id); } static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) -{ //return 1 for self-signed certificates -char buf[256]; -X509 *err_cert; -int err, depth; -SSL *ssl; +{ + //return 1 for self-signed certificates + char buf[256]; + X509 *err_cert; + int err, depth; + SSL *ssl; -err_cert = X509_STORE_CTX_get_current_cert(ctx); -err = X509_STORE_CTX_get_error(ctx); -depth = X509_STORE_CTX_get_error_depth(ctx); + err_cert = X509_STORE_CTX_get_current_cert(ctx); + err = X509_STORE_CTX_get_error(ctx); + depth = X509_STORE_CTX_get_error_depth(ctx); -X509_NAME_oneline(X509_get_subject_name(err_cert), buf, 256); + 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; + if (err == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT && depth == 0) + preverify_ok = 1; -if (!preverify_ok) { - printf("verify error:num=%d:%s:depth=%d:%s\n", err, - X509_verify_cert_error_string(err), depth, buf); - } + if (!preverify_ok) + { + printf("verify error:num=%d:%s:depth=%d:%s\n", err, + X509_verify_cert_error_string(err), depth, buf); + } - /* - * At this point, err contains the last verification error. We can use - * it for something special - */ - if (!preverify_ok && (err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT)) - { - X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256); - printf("issuer= %s\n", buf); - } + /* + * At this point, err contains the last verification error. We can use + * it for something special + */ + if (!preverify_ok && (err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT)) + { + X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256); + printf("issuer= %s\n", buf); + } - return preverify_ok; + return preverify_ok; } static int add_chaninfo(struct PICA_c2n *ci, struct PICA_c2c **chn, const unsigned char *peer_id, int is_outgoing) { -struct PICA_c2c *chnl,*ipt; + struct PICA_c2c *chnl, *ipt; -chnl=*chn=(struct PICA_c2c*)calloc(sizeof(struct PICA_c2c),1); + chnl = *chn = (struct PICA_c2c*)calloc(sizeof(struct PICA_c2c), 1); -if (!chnl) - return 0;//ERR_CHECK + if (!chnl) + return 0;//ERR_CHECK -chnl->conn = ci; -chnl->outgoing = is_outgoing; -memcpy(chnl->peer_id, peer_id, PICA_ID_SIZE); + chnl->conn = ci; + chnl->outgoing = is_outgoing; + memcpy(chnl->peer_id, peer_id, PICA_ID_SIZE); -chnl->acc = ci->acc; + chnl->acc = ci->acc; -chnl->timestamp = time(0); + chnl->timestamp = time(0); -chnl->sck_data = -1;//prevent closing stdin when closing non-active connection + chnl->sck_data = -1;//prevent closing stdin when closing non-active connection -chnl->read_buf = calloc(PICA_CHANREADBUFSIZE, 1); + chnl->read_buf = calloc(PICA_CHANREADBUFSIZE, 1); -if (ci->chan_list_head) + if (ci->chan_list_head) { - ci->chan_list_end->next=chnl; - chnl->prev=ci->chan_list_end; - ci->chan_list_end=chnl; + ci->chan_list_end->next = chnl; + chnl->prev = ci->chan_list_end; + ci->chan_list_end = chnl; } -else + else { - ci->chan_list_head=chnl; - ci->chan_list_end=chnl; + ci->chan_list_head = chnl; + ci->chan_list_end = chnl; } -return 1; + return 1; } static int establish_data_connection(struct PICA_c2c *chnl) { -char* DN_str; + char* DN_str; //unsigned char buf[12]; -int ret,err_ret; -unsigned int tmp_uid; -struct PICA_proto_msg *mp; + int ret, err_ret; + unsigned int tmp_uid; + struct PICA_proto_msg *mp; -chnl->sck_data=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + chnl->sck_data = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); -{ -struct sockaddr_in addr=chnl->conn->srv_addr; + { + struct sockaddr_in addr = chnl->conn->srv_addr; -addr.sin_port = htons(ntohs(addr.sin_port)); + addr.sin_port = htons(ntohs(addr.sin_port)); -ret=connect( chnl->sck_data, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)); + ret = connect( chnl->sck_data, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)); /////////////////state_ -if (ret==SOCKET_ERROR) - { - err_ret=PICA_ERRSOCK; - goto error_ret; + if (ret == SOCKET_ERROR) + { + err_ret = PICA_ERRSOCK; + goto error_ret; + } } -} -mp = c2c_writebuf_push( chnl, PICA_PROTO_CONNID, PICA_PROTO_CONNID_SIZE); -if (mp) + mp = c2c_writebuf_push( chnl, PICA_PROTO_CONNID, PICA_PROTO_CONNID_SIZE); + if (mp) { - if (chnl->outgoing) + if (chnl->outgoing) { - memcpy(mp->tail, chnl->acc->id, PICA_ID_SIZE);//вызвывающий - memcpy(mp->tail + PICA_ID_SIZE, chnl->peer_id, PICA_ID_SIZE);//вызываемый + memcpy(mp->tail, chnl->acc->id, PICA_ID_SIZE);//вызвывающий + memcpy(mp->tail + PICA_ID_SIZE, chnl->peer_id, PICA_ID_SIZE);//вызываемый } - else + else { - memcpy(mp->tail, chnl->peer_id, PICA_ID_SIZE);//вызвывающий - memcpy(mp->tail + PICA_ID_SIZE, chnl->acc->id, PICA_ID_SIZE);//вызываемый - } + memcpy(mp->tail, chnl->peer_id, PICA_ID_SIZE);//вызвывающий + memcpy(mp->tail + PICA_ID_SIZE, chnl->acc->id, PICA_ID_SIZE);//вызываемый + } } -else + else { - err_ret=PICA_ERRNOMEM; - goto error_ret; + err_ret = PICA_ERRNOMEM; + goto error_ret; } -do + do { - err_ret = PICA_write_c2c(chnl); - if (PICA_OK != err_ret) - goto error_ret; + err_ret = PICA_write_c2c(chnl); + if (PICA_OK != err_ret) + goto error_ret; } -while( chnl->write_pos > 0); + while( chnl->write_pos > 0); -chnl->ssl=SSL_new(chnl->acc->ctx); + chnl->ssl = SSL_new(chnl->acc->ctx); -if (!chnl->ssl) + if (!chnl->ssl) { - //puts("SSL_new !- 0");//debug - err_ret=PICA_ERRSSL; - goto error_ret; + //puts("SSL_new !- 0");//debug + err_ret = PICA_ERRSSL; + goto error_ret; } -ret=SSL_set_fd(chnl->ssl, chnl->sck_data); + ret = SSL_set_fd(chnl->ssl, chnl->sck_data); -if (!ret) + if (!ret) { - //puts("SSL_set_fd returned 0");//debug - err_ret=PICA_ERRSSL; - goto error_ret_; + //puts("SSL_set_fd returned 0");//debug + err_ret = PICA_ERRSSL; + goto error_ret_; } -SSL_set_verify(chnl->ssl, SSL_VERIFY_PEER, verify_callback); -SSL_set_verify_depth(chnl->ssl, 1);//peer certificate and one CA + SSL_set_verify(chnl->ssl, SSL_VERIFY_PEER, verify_callback); + SSL_set_verify_depth(chnl->ssl, 1);//peer certificate and one CA -if (chnl->outgoing) -ret=SSL_connect(chnl->ssl); -else -ret=SSL_accept(chnl->ssl); + if (chnl->outgoing) + ret = SSL_connect(chnl->ssl); + else + ret = SSL_accept(chnl->ssl); /////////////////state_ //printf("verify result:%i\n",(int)SSL_get_verify_result(chnl->ssl));//debug -if (ret!=1) + if (ret != 1) { - //printf("ret=%i of SSL_connect or accept\n",ret);//debug - //printf("SSL_get_error says:%i\n",SSL_get_error(chnl->ssl,ret));//debug - err_ret=PICA_ERRSSL; - goto error_ret_; + //printf("ret=%i of SSL_connect or accept\n",ret);//debug + //printf("SSL_get_error says:%i\n",SSL_get_error(chnl->ssl,ret));//debug + err_ret = PICA_ERRSSL; + goto error_ret_; } //проверить сертификат собеседника -chnl->peer_cert=SSL_get_peer_certificate(chnl->ssl); + chnl->peer_cert = SSL_get_peer_certificate(chnl->ssl); -if (!chnl->peer_cert) + if (!chnl->peer_cert) { - err_ret=PICA_ERRNOPEERCERT; - goto error_ret_; + err_ret = PICA_ERRNOPEERCERT; + goto error_ret_; } -{ -unsigned char temp_id[PICA_ID_SIZE]; - -if (PICA_id_from_X509(chnl->peer_cert, temp_id) == 0) { - err_ret=PICA_ERRNOPEERCERT; - goto error_ret_; - } + unsigned char temp_id[PICA_ID_SIZE]; -if (memcmp(temp_id, chnl->peer_id, PICA_ID_SIZE) != 0) - { - err_ret=PICA_ERRINVPEERCERT; - goto error_ret_; - } -} -/* -DN_str=X509_NAME_oneline(X509_get_subject_name(chnl->peer_cert), 0, 0); + if (PICA_id_from_X509(chnl->peer_cert, temp_id) == 0) + { + err_ret = PICA_ERRNOPEERCERT; + goto error_ret_; + } -if (!DN_str) - { - //puts("no DN_str");//debug - err_ret=PICA_ERRSSL; - goto error_ret_; + if (memcmp(temp_id, chnl->peer_id, PICA_ID_SIZE) != 0) + { + err_ret = PICA_ERRINVPEERCERT; + goto error_ret_; + } } + /* + DN_str=X509_NAME_oneline(X509_get_subject_name(chnl->peer_cert), 0, 0); -if (!get_id_fromsubjstr(DN_str,&tmp_uid) || tmp_uid!=chnl->peer_id) - { - err_ret=PICA_ERRINVPEERCERT; - goto error_ret_; - } -//puts(DN_str);//debug + if (!DN_str) + { + //puts("no DN_str");//debug + err_ret=PICA_ERRSSL; + goto error_ret_; + } + + if (!get_id_fromsubjstr(DN_str,&tmp_uid) || tmp_uid!=chnl->peer_id) + { + err_ret=PICA_ERRINVPEERCERT; + goto error_ret_; + } + //puts(DN_str);//debug -OPENSSL_free(DN_str);*/ + OPENSSL_free(DN_str);*/ -{ -BIO *mem = BIO_new(BIO_s_mem()); -char *cert_pem; -unsigned int cert_pem_nb; + { + BIO *mem = BIO_new(BIO_s_mem()); + char *cert_pem; + unsigned int cert_pem_nb; -PEM_write_bio_X509(mem, chnl->peer_cert); + PEM_write_bio_X509(mem, chnl->peer_cert); -cert_pem_nb = (unsigned int)BIO_get_mem_data(mem, &cert_pem); + cert_pem_nb = (unsigned int)BIO_get_mem_data(mem, &cert_pem); -if (callbacks.peer_cert_verify_cb(chnl->peer_id, (const char*)cert_pem, cert_pem_nb) == 0) - { - BIO_free(mem); - err_ret=PICA_ERRINVPEERCERT; - goto error_ret_; - } + if (callbacks.peer_cert_verify_cb(chnl->peer_id, (const char*)cert_pem, cert_pem_nb) == 0) + { + BIO_free(mem); + err_ret = PICA_ERRINVPEERCERT; + goto error_ret_; + } -BIO_free(mem); -} + BIO_free(mem); + } -chnl->state=PICA_C2C_STATE_ACTIVE; + chnl->state = PICA_C2C_STATE_ACTIVE; -IOCTLSETNONBLOCKINGSOCKET(chnl->sck_data, 1); + IOCTLSETNONBLOCKINGSOCKET(chnl->sck_data, 1); -return PICA_OK; + return PICA_OK; error_ret_: error_ret: -callbacks.c2c_failed(chnl->peer_id); -PICA_close_c2c(chnl); -return err_ret; + callbacks.c2c_failed(chnl->peer_id); + PICA_close_c2c(chnl); + return err_ret; } -static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb,void* p) +static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_c2c *cc=(struct PICA_c2n *)p; + struct PICA_c2c *cc = (struct PICA_c2n *)p; -if (buf[2] == PICA_C2CPROTO_VER_HIGH && buf[3] == PICA_C2CPROTO_VER_LOW) - { - //send ok - } -else - { - //send verdiffer, disconnect after sending - } + if (buf[2] == PICA_C2CPROTO_VER_HIGH && buf[3] == PICA_C2CPROTO_VER_LOW) + { + //send ok + } + else + { + //send verdiffer, disconnect after sending + } -return 1; + return 1; } -static unsigned int procmsg_INITRESP_c2c(unsigned char* buf, unsigned int nb,void* p) +static unsigned int procmsg_INITRESP_c2c(unsigned char* buf, unsigned int nb, void* p) { } -static unsigned int procmsg_INITRESP(unsigned char* buf, unsigned int nb,void* p) +static unsigned int procmsg_INITRESP(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_c2n *ci=(struct PICA_c2n *)p; + struct PICA_c2n *ci = (struct PICA_c2n *)p; -switch(buf[0]) + switch(buf[0]) { case PICA_PROTO_INITRESPOK: - ci -> init_resp_ok = 1; - break; - + ci -> init_resp_ok = 1; + break; + case PICA_PROTO_VERDIFFER: - ci->init_resp_ok = -1; - ci->node_ver_major = buf[2]; - ci->node_ver_minor = buf[3]; - break; - + ci->init_resp_ok = -1; + ci->node_ver_major = buf[2]; + ci->node_ver_minor = buf[3]; + break; + default: - return 0; - } + return 0; + } -return 1; + return 1; } -static unsigned int procmsg_CONNREQINC(unsigned char* buf,unsigned int nb,void* p) +static unsigned int procmsg_CONNREQINC(unsigned char* buf, unsigned int nb, void* p) { -int ret; -struct PICA_c2n *ci=(struct PICA_c2n *)p; -struct PICA_proto_msg *mp; -unsigned char *peer_id = buf + 2; + int ret; + struct PICA_c2n *ci = (struct PICA_c2n *)p; + struct PICA_proto_msg *mp; + unsigned char *peer_id = buf + 2; if (callbacks.accept_cb(peer_id)) - { + { struct PICA_c2c *_chnl; - + mp = c2n_writebuf_push( ci, PICA_PROTO_CONNALLOW, PICA_PROTO_CONNALLOW_SIZE); - + if (mp) - { + { memcpy(mp->tail, peer_id, PICA_ID_SIZE); - } + } else return 0; - + ret = add_chaninfo( ci, &_chnl, peer_id, 0); if (!ret) return 0; //ERR_CHECK - кончилась память - + do - { + { ret = PICA_write_c2n(ci); if (PICA_OK != ret) return 0; - } + } while( ci->write_pos > 0); ret = establish_data_connection(_chnl); - if (ret!=PICA_OK) + if (ret != PICA_OK) return 1; - callbacks.c2c_established_cb(_chnl->peer_id);//*nchn=_chnl; + callbacks.c2c_established_cb(_chnl->peer_id);//*nchn=_chnl; return 1; - } + } else - { + { mp = c2n_writebuf_push(ci, PICA_PROTO_CONNDENY, PICA_PROTO_CONNDENY_SIZE); - + if (mp) - { + { memcpy(mp->tail, peer_id, PICA_ID_SIZE); - } + } else return 0;//ERR_CHECK - } -return 1; + } + return 1; } -static unsigned int procmsg_NOTFOUND(unsigned char* buf,unsigned int nb,void* p) +static unsigned int procmsg_NOTFOUND(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_c2n *ci=(struct PICA_c2n *)p; -struct PICA_c2c *ipt,*rq=0; -unsigned char *peer_id = buf + 2; + struct PICA_c2n *ci = (struct PICA_c2n *)p; + struct PICA_c2c *ipt, *rq = 0; + unsigned char *peer_id = buf + 2; //puts("procmsg_NOTFOUND");//debug -ipt=ci->chan_list_end; -while(ipt) + ipt = ci->chan_list_end; + while(ipt) { - if (memcmp(ipt->peer_id, peer_id, PICA_ID_SIZE) == 0) + if (memcmp(ipt->peer_id, peer_id, PICA_ID_SIZE) == 0) { - rq=ipt; - break; + rq = ipt; + break; } - ipt=ipt->prev; + ipt = ipt->prev; } -if (!rq) - return 0;// ERR_CHECK -левое сообщение, такой запрос не посылался + if (!rq) + return 0;// ERR_CHECK -левое сообщение, такой запрос не посылался //puts("procmsg_NOTFOUND_chkp0");//debug -PICA_close_c2c(rq); + PICA_close_c2c(rq); //puts("procmsg_NOTFOUND_chkp1");//debug -callbacks.notfound_cb(peer_id); -return 1; + callbacks.notfound_cb(peer_id); + return 1; } -static unsigned int procmsg_FOUND(unsigned char* buf,unsigned int nb,void* p) +static unsigned int procmsg_FOUND(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_c2n *ci=(struct PICA_c2n *)p; -struct PICA_c2c *ipt,*rq=0; -unsigned char *peer_id = buf + 2; -int ret; + struct PICA_c2n *ci = (struct PICA_c2n *)p; + struct PICA_c2c *ipt, *rq = 0; + unsigned char *peer_id = buf + 2; + int ret; -ipt=ci->chan_list_end; -while(ipt) + ipt = ci->chan_list_end; + while(ipt) { - if (memcmp(ipt->peer_id, peer_id, PICA_ID_SIZE) == 0) + if (memcmp(ipt->peer_id, peer_id, PICA_ID_SIZE) == 0) { - rq=ipt; - break; + rq = ipt; + break; } - ipt=ipt->prev; - } + ipt = ipt->prev; + } -if (!rq) - return 0;// ERR_CHECK -левое сообщение, такой запрос не посылался + if (!rq) + return 0;// ERR_CHECK -левое сообщение, такой запрос не посылался -ret=establish_data_connection(rq); + ret = establish_data_connection(rq); -if (ret!=PICA_OK) - return 0; + if (ret != PICA_OK) + return 0; -callbacks.c2c_established_cb(rq->peer_id);//*nchn=_chnl; + callbacks.c2c_established_cb(rq->peer_id);//*nchn=_chnl; -return 1; + return 1; } static unsigned int procmsg_CLNODELIST(unsigned char* buf, unsigned int nb, void* p) { -unsigned int pos = 4; -char ipaddr_string[INET6_ADDRSTRLEN]; -char temp_zeroswap; -unsigned int port; + unsigned int pos = 4; + char ipaddr_string[INET6_ADDRSTRLEN]; + char temp_zeroswap; + unsigned int port; //puts("CLNODELIST");//debug //callbacks.nodelist_cb(buf + 4, nb - 4); -do + do { - switch(buf[pos]) + switch(buf[pos]) { - case PICA_PROTO_NEWNODE_IPV4: - - callbacks.nodelist_cb( - PICA_PROTO_NEWNODE_IPV4, - buf + pos +1, - inet_ntop(AF_INET, buf + pos +1, ipaddr_string, INET6_ADDRSTRLEN), - ntohs(*(uint16_t*)(buf + pos + 5)) - ); - - pos += PICA_PROTO_NODELIST_ITEM_IPV4_SIZE; - break; - - case PICA_PROTO_NEWNODE_IPV6: - - callbacks.nodelist_cb( - PICA_PROTO_NEWNODE_IPV6, - buf + pos +1, - inet_ntop(AF_INET6, buf + pos +1, ipaddr_string, INET6_ADDRSTRLEN), - ntohs(*(uint16_t*)(buf + pos + 17)) - ); - - pos += PICA_PROTO_NODELIST_ITEM_IPV6_SIZE; - break; - - case PICA_PROTO_NEWNODE_DNS: - - port = ntohs(*(uint16_t*)(buf + pos + buf[pos+1] + 2)); - - temp_zeroswap = buf[pos + 2 + buf[pos+1]]; //save byte after hostname string - buf[pos + 2 + buf[pos+1]] = '\0';// and replace it with string terminating zero - - callbacks.nodelist_cb( - PICA_PROTO_NEWNODE_DNS, - buf + pos +2, - buf + pos +2, - port - ); - - buf[pos + 2 + buf[pos+1]] = temp_zeroswap; - - pos += 4 + buf[pos+1]; - break; - - default: - //puts("unknown node address type");//debug - return 0; + case PICA_PROTO_NEWNODE_IPV4: + + callbacks.nodelist_cb( + PICA_PROTO_NEWNODE_IPV4, + buf + pos + 1, + inet_ntop(AF_INET, buf + pos + 1, ipaddr_string, INET6_ADDRSTRLEN), + ntohs(*(uint16_t*)(buf + pos + 5)) + ); + + pos += PICA_PROTO_NODELIST_ITEM_IPV4_SIZE; + break; + + case PICA_PROTO_NEWNODE_IPV6: + + callbacks.nodelist_cb( + PICA_PROTO_NEWNODE_IPV6, + buf + pos + 1, + inet_ntop(AF_INET6, buf + pos + 1, ipaddr_string, INET6_ADDRSTRLEN), + ntohs(*(uint16_t*)(buf + pos + 17)) + ); + + pos += PICA_PROTO_NODELIST_ITEM_IPV6_SIZE; + break; + + case PICA_PROTO_NEWNODE_DNS: + + port = ntohs(*(uint16_t*)(buf + pos + buf[pos + 1] + 2)); + + temp_zeroswap = buf[pos + 2 + buf[pos + 1]]; //save byte after hostname string + buf[pos + 2 + buf[pos + 1]] = '\0'; // and replace it with string terminating zero + + callbacks.nodelist_cb( + PICA_PROTO_NEWNODE_DNS, + buf + pos + 2, + buf + pos + 2, + port + ); + + buf[pos + 2 + buf[pos + 1]] = temp_zeroswap; + + pos += 4 + buf[pos + 1]; + break; + + default: + //puts("unknown node address type");//debug + return 0; } } -while(pos < nb); + while(pos < nb); -return 1; + return 1; } static unsigned int procmsg_MSGUTF8(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_c2c *chan = (struct PICA_c2c *)p; -struct PICA_proto_msg *mp; + struct PICA_c2c *chan = (struct PICA_c2c *)p; + struct PICA_proto_msg *mp; -callbacks.newmsg_cb(chan->peer_id, buf + 4, nb - 4, buf[0]); + callbacks.newmsg_cb(chan->peer_id, buf + 4, nb - 4, buf[0]); //send PICA_PROTO_MSGOK -mp = c2c_writebuf_push( chan, PICA_PROTO_MSGOK, PICA_PROTO_MSGOK_SIZE); + mp = c2c_writebuf_push( chan, PICA_PROTO_MSGOK, PICA_PROTO_MSGOK_SIZE); -if (mp) + if (mp) { - RAND_bytes( mp->tail, 2); + RAND_bytes( mp->tail, 2); } -else - return 0; + else + return 0; -return 1; + return 1; } static unsigned int procmsg_MSGOK(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_c2c *chan = (struct PICA_c2c *)p; + struct PICA_c2c *chan = (struct PICA_c2c *)p; -callbacks.msgok_cb(chan -> peer_id); -return 1; + callbacks.msgok_cb(chan -> peer_id); + return 1; } -unsigned int procmsg_PINGREQ(unsigned char* buf,unsigned int nb,void* p) +unsigned int procmsg_PINGREQ(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_c2n *ci=(struct PICA_c2n *)p; -struct PICA_proto_msg *mp; + struct PICA_c2n *ci = (struct PICA_c2n *)p; + struct PICA_proto_msg *mp; -mp = c2n_writebuf_push(ci, PICA_PROTO_PINGREP, PICA_PROTO_PINGREP_SIZE); + mp = c2n_writebuf_push(ci, PICA_PROTO_PINGREP, PICA_PROTO_PINGREP_SIZE); -if (mp) - { - RAND_bytes(mp->tail, 2); - } -else - return 0; + if (mp) + { + RAND_bytes(mp->tail, 2); + } + else + return 0; -return 1; + return 1; } int PICA_deny_file(struct PICA_c2c *chan) { -struct PICA_proto_msg *mp; + struct PICA_proto_msg *mp; -if (chan->recvfilestate != PICA_CHANRECVFILESTATE_WAITACCEPT) - return PICA_ERRINVARG; + if (chan->recvfilestate != PICA_CHANRECVFILESTATE_WAITACCEPT) + return PICA_ERRINVARG; -chan->recvfilestate = PICA_CHANRECVFILESTATE_IDLE; + chan->recvfilestate = PICA_CHANRECVFILESTATE_IDLE; -mp = c2c_writebuf_push(chan, PICA_PROTO_DENIEDFILE, PICA_PROTO_DENIEDFILE_SIZE); + mp = c2c_writebuf_push(chan, PICA_PROTO_DENIEDFILE, PICA_PROTO_DENIEDFILE_SIZE); -if (mp) - { - RAND_bytes(mp->tail, 2); - } -else - return PICA_ERRNOMEM; + if (mp) + { + RAND_bytes(mp->tail, 2); + } + else + return PICA_ERRNOMEM; -return PICA_OK; + return PICA_OK; } int PICA_accept_file(struct PICA_c2c *chan, char *filename, unsigned int filenamesize) { -struct PICA_proto_msg *mp; -int ret; + struct PICA_proto_msg *mp; + int ret; -if (chan->recvfilestate != PICA_CHANRECVFILESTATE_WAITACCEPT) - return PICA_ERRINVARG; + if (chan->recvfilestate != PICA_CHANRECVFILESTATE_WAITACCEPT) + return PICA_ERRINVARG; //open file -ret = PICA_recvfile_open_write(chan, filename, filenamesize); + ret = PICA_recvfile_open_write(chan, filename, filenamesize); -if (ret != PICA_OK) - return ret; + if (ret != PICA_OK) + return ret; -mp = c2c_writebuf_push(chan, PICA_PROTO_ACCEPTEDFILE, PICA_PROTO_ACCEPTEDFILE_SIZE); + mp = c2c_writebuf_push(chan, PICA_PROTO_ACCEPTEDFILE, PICA_PROTO_ACCEPTEDFILE_SIZE); -if (mp) - { - RAND_bytes(mp->tail, 2); - } -else - return PICA_ERRNOMEM; + if (mp) + { + RAND_bytes(mp->tail, 2); + } + else + return PICA_ERRNOMEM; -chan->recvfilestate = PICA_CHANRECVFILESTATE_RECEIVING; + chan->recvfilestate = PICA_CHANRECVFILESTATE_RECEIVING; -return PICA_OK; + return PICA_OK; } static unsigned int procmsg_SENDFILEREQUEST(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_c2c *chan = (struct PICA_c2c *)p; -struct PICA_proto_msg *mp; -int ret; + struct PICA_c2c *chan = (struct PICA_c2c *)p; + struct PICA_proto_msg *mp; + int ret; -char *filename = buf + 12; -unsigned int filenamesize = *(uint16_t*)(buf + 2) - 8; + char *filename = buf + 12; + unsigned int filenamesize = *(uint16_t*)(buf + 2) - 8; -if (chan->recvfilestate != PICA_CHANRECVFILESTATE_IDLE) - return 0; + if (chan->recvfilestate != PICA_CHANRECVFILESTATE_IDLE) + return 0; -chan->recvfilestate = PICA_CHANRECVFILESTATE_WAITACCEPT; -chan->recvfile_size = *(uint64_t*)(buf + 4); -chan->recvfile_pos = 0; + chan->recvfilestate = PICA_CHANRECVFILESTATE_WAITACCEPT; + chan->recvfile_size = *(uint64_t*)(buf + 4); + chan->recvfile_pos = 0; -ret = callbacks.accept_file_cb(chan->peer_id, *(uint64_t*)(buf + 4), filename, filenamesize); + ret = callbacks.accept_file_cb(chan->peer_id, *(uint64_t*)(buf + 4), filename, filenamesize); -if (ret > 0) + if (ret > 0) { - if (ret == 1) - { - if (PICA_accept_file(chan, filename, filenamesize) != PICA_OK) - if (PICA_deny_file(chan) != PICA_OK) - return 0; - } + if (ret == 1) + { + if (PICA_accept_file(chan, filename, filenamesize) != PICA_OK) + if (PICA_deny_file(chan) != PICA_OK) + return 0; + } } -else - { - if (PICA_deny_file(chan) != PICA_OK) - return 0; - } + else + { + if (PICA_deny_file(chan) != PICA_OK) + return 0; + } -return 1; + return 1; } static unsigned int procmsg_ACCEPTEDFILE(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_c2c *chan = (struct PICA_c2c *)p; + struct PICA_c2c *chan = (struct PICA_c2c *)p; -if (chan->sendfilestate != PICA_CHANSENDFILESTATE_SENTREQ) - return 0; + if (chan->sendfilestate != PICA_CHANSENDFILESTATE_SENTREQ) + return 0; -callbacks.accepted_file_cb(chan->peer_id); + callbacks.accepted_file_cb(chan->peer_id); -chan->sendfilestate = PICA_CHANSENDFILESTATE_SENDING; + chan->sendfilestate = PICA_CHANSENDFILESTATE_SENDING; -return 1; + return 1; } static unsigned int procmsg_DENIEDFILE(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_c2c *chan = (struct PICA_c2c *)p; + struct PICA_c2c *chan = (struct PICA_c2c *)p; -if (chan->sendfilestate != PICA_CHANSENDFILESTATE_SENTREQ) - return 0; + if (chan->sendfilestate != PICA_CHANSENDFILESTATE_SENTREQ) + return 0; -callbacks.denied_file_cb(chan->peer_id); + callbacks.denied_file_cb(chan->peer_id); -chan->sendfilestate = PICA_CHANSENDFILESTATE_IDLE; + chan->sendfilestate = PICA_CHANSENDFILESTATE_IDLE; -fclose(chan->sendfile_stream); -chan->sendfile_stream = NULL; + fclose(chan->sendfile_stream); + chan->sendfile_stream = NULL; -return 1; + return 1; } static unsigned int procmsg_FILEFRAGMENT(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_c2c *chan = (struct PICA_c2c *)p; + struct PICA_c2c *chan = (struct PICA_c2c *)p; -/* - *Allow incoming FILEFRAGMENTs while paused - */ -if (chan->recvfilestate != PICA_CHANRECVFILESTATE_RECEIVING - && chan->recvfilestate != PICA_CHANRECVFILESTATE_PAUSED) - return 0; + /* + *Allow incoming FILEFRAGMENTs while paused + */ + if (chan->recvfilestate != PICA_CHANRECVFILESTATE_RECEIVING + && chan->recvfilestate != PICA_CHANRECVFILESTATE_PAUSED) + return 0; -if (nb - 4 != *(uint16_t*)(buf + 2)) - return 0; + if (nb - 4 != *(uint16_t*)(buf + 2)) + return 0; -if (fwrite(buf + 4, nb - 4, 1, chan->recvfile_stream) != 1) - { - struct PICA_proto_msg *mp; + if (fwrite(buf + 4, nb - 4, 1, chan->recvfile_stream) != 1) + { + struct PICA_proto_msg *mp; - fclose(chan->recvfile_stream); - chan->recvfile_stream = NULL; + fclose(chan->recvfile_stream); + chan->recvfile_stream = NULL; - chan->recvfilestate = PICA_CHANRECVFILESTATE_IDLE; + chan->recvfilestate = PICA_CHANRECVFILESTATE_IDLE; - if (PICA_OK != PICA_send_filecontrol(chan, PICA_PROTO_FILECONTROL_VOID, PICA_PROTO_FILECONTROL_IOERROR)) - return 0; - } + if (PICA_OK != PICA_send_filecontrol(chan, PICA_PROTO_FILECONTROL_VOID, PICA_PROTO_FILECONTROL_IOERROR)) + return 0; + } -chan->recvfile_pos += (nb - 4); + chan->recvfile_pos += (nb - 4); -if (chan->recvfile_pos > chan->recvfile_size) //received more than file_size - return 0; + if (chan->recvfile_pos > chan->recvfile_size) //received more than file_size + return 0; -callbacks.file_progress(chan->peer_id, 0, chan->recvfile_pos); + callbacks.file_progress(chan->peer_id, 0, chan->recvfile_pos); -if (chan->recvfile_pos == chan->recvfile_size) - { - chan->recvfilestate = PICA_CHANRECVFILESTATE_IDLE; - fclose(chan->recvfile_stream); - chan->recvfile_stream = NULL; + if (chan->recvfile_pos == chan->recvfile_size) + { + chan->recvfilestate = PICA_CHANRECVFILESTATE_IDLE; + fclose(chan->recvfile_stream); + chan->recvfile_stream = NULL; - callbacks.file_finished(chan->peer_id, 0); - } + callbacks.file_finished(chan->peer_id, 0); + } -return 1; + return 1; } static unsigned int procmsg_FILECONTROL(unsigned char* buf, unsigned int nb, void* p) { -struct PICA_c2c *chan = (struct PICA_c2c *)p; -unsigned int sender_cmd, receiver_cmd; - -sender_cmd = buf[2]; -receiver_cmd = buf[3]; - -fprintf(stderr, "procmsg_FILECONTROL sender_cmd = %i receiver_cmd = %i\n", sender_cmd, receiver_cmd);//debug - -if ((chan->sendfilestate == PICA_CHANSENDFILESTATE_IDLE || chan->sendfilestate == PICA_CHANSENDFILESTATE_SENTREQ) - && receiver_cmd != PICA_PROTO_FILECONTROL_VOID) - return 0; - -if (chan->recvfilestate == PICA_CHANRECVFILESTATE_IDLE && sender_cmd != PICA_PROTO_FILECONTROL_VOID) - return 0; - -fprintf(stderr, "procmsg_FILECONTROL switch(sender_cmd)\n"); - -switch(sender_cmd) - { - case PICA_PROTO_FILECONTROL_PAUSE: - if (chan->recvfilestate == PICA_CHANRECVFILESTATE_RECEIVING) - chan->recvfilestate = PICA_CHANRECVFILESTATE_PAUSED; - else - return 0; - break; - - case PICA_PROTO_FILECONTROL_RESUME: - if (chan->recvfilestate == PICA_CHANRECVFILESTATE_PAUSED) - chan->recvfilestate = PICA_CHANRECVFILESTATE_RECEIVING; - else - return 0; - break; - - case PICA_PROTO_FILECONTROL_CANCEL: - case PICA_PROTO_FILECONTROL_IOERROR: - chan->recvfilestate = PICA_CHANRECVFILESTATE_IDLE; - fclose(chan->recvfile_stream); - chan->recvfile_stream = NULL; - break; - - case PICA_PROTO_FILECONTROL_VOID: - break; - - default: - return 0; - } - -fprintf(stderr, "procmsg_FILECONTROL switch(receiver_cmd)\n"); -switch(receiver_cmd) - { - case PICA_PROTO_FILECONTROL_PAUSE: - if (chan->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) - chan->sendfilestate = PICA_CHANSENDFILESTATE_PAUSED; - else - return 0; - break; - - case PICA_PROTO_FILECONTROL_RESUME: - if (chan->sendfilestate == PICA_CHANSENDFILESTATE_PAUSED) - chan->sendfilestate = PICA_CHANSENDFILESTATE_SENDING; - else - return 0; - break; - - case PICA_PROTO_FILECONTROL_CANCEL: - case PICA_PROTO_FILECONTROL_IOERROR: - chan->sendfilestate = PICA_CHANSENDFILESTATE_IDLE; - fclose(chan->sendfile_stream); - chan->sendfile_stream = NULL; - break; - - case PICA_PROTO_FILECONTROL_VOID: - break; - - default: - return 0; - } - -fprintf(stderr, "procmsg_FILECONTROL calling callback\n"); -callbacks.file_control(chan->peer_id, sender_cmd, receiver_cmd); + struct PICA_c2c *chan = (struct PICA_c2c *)p; + unsigned int sender_cmd, receiver_cmd; -return 1; + sender_cmd = buf[2]; + receiver_cmd = buf[3]; + + fprintf(stderr, "procmsg_FILECONTROL sender_cmd = %i receiver_cmd = %i\n", sender_cmd, receiver_cmd);//debug + + if ((chan->sendfilestate == PICA_CHANSENDFILESTATE_IDLE || chan->sendfilestate == PICA_CHANSENDFILESTATE_SENTREQ) + && receiver_cmd != PICA_PROTO_FILECONTROL_VOID) + return 0; + + if (chan->recvfilestate == PICA_CHANRECVFILESTATE_IDLE && sender_cmd != PICA_PROTO_FILECONTROL_VOID) + return 0; + + fprintf(stderr, "procmsg_FILECONTROL switch(sender_cmd)\n"); + + switch(sender_cmd) + { + case PICA_PROTO_FILECONTROL_PAUSE: + if (chan->recvfilestate == PICA_CHANRECVFILESTATE_RECEIVING) + chan->recvfilestate = PICA_CHANRECVFILESTATE_PAUSED; + else + return 0; + break; + + case PICA_PROTO_FILECONTROL_RESUME: + if (chan->recvfilestate == PICA_CHANRECVFILESTATE_PAUSED) + chan->recvfilestate = PICA_CHANRECVFILESTATE_RECEIVING; + else + return 0; + break; + + case PICA_PROTO_FILECONTROL_CANCEL: + case PICA_PROTO_FILECONTROL_IOERROR: + chan->recvfilestate = PICA_CHANRECVFILESTATE_IDLE; + fclose(chan->recvfile_stream); + chan->recvfile_stream = NULL; + break; + + case PICA_PROTO_FILECONTROL_VOID: + break; + + default: + return 0; + } + + fprintf(stderr, "procmsg_FILECONTROL switch(receiver_cmd)\n"); + switch(receiver_cmd) + { + case PICA_PROTO_FILECONTROL_PAUSE: + if (chan->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) + chan->sendfilestate = PICA_CHANSENDFILESTATE_PAUSED; + else + return 0; + break; + + case PICA_PROTO_FILECONTROL_RESUME: + if (chan->sendfilestate == PICA_CHANSENDFILESTATE_PAUSED) + chan->sendfilestate = PICA_CHANSENDFILESTATE_SENDING; + else + return 0; + break; + + case PICA_PROTO_FILECONTROL_CANCEL: + case PICA_PROTO_FILECONTROL_IOERROR: + chan->sendfilestate = PICA_CHANSENDFILESTATE_IDLE; + fclose(chan->sendfile_stream); + chan->sendfile_stream = NULL; + break; + + case PICA_PROTO_FILECONTROL_VOID: + break; + + default: + return 0; + } + + fprintf(stderr, "procmsg_FILECONTROL calling callback\n"); + callbacks.file_control(chan->peer_id, sender_cmd, receiver_cmd); + + return 1; } #ifdef PICA_MULTITHREADED @@ -933,23 +939,23 @@ return 1; #ifdef WIN32 void locking_cb(int mode, int type, char *file, int line) { - if (mode & CRYPTO_LOCK) - WaitForSingleObject(mt_locks[type],INFINITE); - else - ReleaseMutex(mt_locks[type]); + if (mode & CRYPTO_LOCK) + WaitForSingleObject(mt_locks[type], INFINITE); + else + ReleaseMutex(mt_locks[type]); } #else unsigned long thread_id_cb(void) { - return (unsigned long)pthread_self(); + return (unsigned long)pthread_self(); } void locking_cb(int mode, int type, char *file, int line) { - if (mode & CRYPTO_LOCK) - pthread_mutex_lock(&mt_locks[type]); - else - pthread_mutex_unlock(&mt_locks[type]); + if (mode & CRYPTO_LOCK) + pthread_mutex_lock(&mt_locks[type]); + else + pthread_mutex_unlock(&mt_locks[type]); } #endif @@ -958,48 +964,48 @@ void locking_cb(int mode, int type, char *file, int line) int PICA_client_init(struct PICA_client_callbacks *clcbs) { -struct sockaddr_in sd; + struct sockaddr_in sd; #ifdef WIN32 -WSADATA wsd; -WSAStartup(MAKEWORD(2,2),&wsd); + WSADATA wsd; + WSAStartup(MAKEWORD(2, 2), &wsd); #endif -if (!clcbs) - return 0; + if (!clcbs) + return 0; -callbacks=*clcbs; + callbacks = *clcbs; -SSL_load_error_strings(); -SSL_library_init(); + SSL_load_error_strings(); + SSL_library_init(); -#ifdef NO_RAND_DEV -PICA_rand_seed(); +#ifdef NO_RAND_DEV + PICA_rand_seed(); #endif #ifdef PICA_MULTITHREADED -{ - int i; + { + int i; #ifdef WIN32 -mt_locks = malloc(CRYPTO_num_locks()*sizeof(HANDLE)); + mt_locks = malloc(CRYPTO_num_locks() * sizeof(HANDLE)); -for (i=0; i 65535 || local_port <= 0 || local_port > 65535 || !l) - return PICA_ERRINVARG; + if (!acc || !public_addr || public_port <= 0 || public_port > 65535 || local_port <= 0 || local_port > 65535 || !l) + return PICA_ERRINVARG; - lst = *l = (struct PICA_listener*)calloc(sizeof(struct PICA_listener), 1); + lst = *l = (struct PICA_listener*)calloc(sizeof(struct PICA_listener), 1); - if (!lst) - return PICA_ERRNOMEM; + if (!lst) + return PICA_ERRNOMEM; - lst->public_addr_dns = strdup(public_addr); + lst->public_addr_dns = strdup(public_addr); - if (!lst->public_addr_dns) - return PICA_ERRNOMEM; + if (!lst->public_addr_dns) + return PICA_ERRNOMEM; - lst->public_addr_ipv4 = inet_addr(public_addr); + lst->public_addr_ipv4 = inet_addr(public_addr); - lst->acc = acc; - lst->public_port = public_port; - lst->local_port = local_port; + lst->acc = acc; + lst->public_port = public_port; + lst->local_port = local_port; - lst->sck_listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); //(1) + lst->sck_listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); //(1) - if (lst->sck_listener == SOCKET_ERROR) - { - ret_err = PICA_ERRSOCK; - goto error_ret_1; - } + if (lst->sck_listener == SOCKET_ERROR) + { + ret_err = PICA_ERRSOCK; + goto error_ret_1; + } - flag = 1; - setsockopt(lst->sck_listener, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag)); + flag = 1; + setsockopt(lst->sck_listener, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag)); - memset(&s, 0, sizeof(s)); - s.sin_family = AF_INET; - s.sin_addr.s_addr = INADDR_ANY; - s.sin_port = htons(local_port); + memset(&s, 0, sizeof(s)); + s.sin_family = AF_INET; + s.sin_addr.s_addr = INADDR_ANY; + s.sin_port = htons(local_port); - ret = bind(lst->sck_listener, (const struct sockaddr*) &s, sizeof(s));//(2) + ret = bind(lst->sck_listener, (const struct sockaddr*) &s, sizeof(s));//(2) - if (ret == SOCKET_ERROR) - { - ret_err = PICA_ERRSOCK; - goto error_ret_2; - } + if (ret == SOCKET_ERROR) + { + ret_err = PICA_ERRSOCK; + goto error_ret_2; + } - ret = listen(lst->sck_listener, 10); + ret = listen(lst->sck_listener, 10); - if (ret == SOCKET_ERROR) - { - ret_err = PICA_ERRSOCK; - goto error_ret_2; - } + if (ret == SOCKET_ERROR) + { + ret_err = PICA_ERRSOCK; + goto error_ret_2; + } - return PICA_OK; + return PICA_OK; - error_ret_2: //(2) +error_ret_2: //(2) - CLOSE(lst->sck_listener); + CLOSE(lst->sck_listener); - error_ret_1: //(1) +error_ret_1: //(1) - free(lst->public_addr_dns); - free(lst); - *l = 0; + free(lst->public_addr_dns); + free(lst); + *l = 0; - return ret_err; + return ret_err; } int PICA_open_acc(const char *cert_file, @@ -1139,173 +1145,173 @@ int PICA_open_acc(const char *cert_file, int (*password_cb)(char *buf, int size, int rwflag, void *userdata), struct PICA_acc **acc) { -int ret,ret_err; -DH *dh = NULL; -FILE *dh_file = NULL; -struct PICA_acc *a = NULL; + int ret, ret_err; + DH *dh = NULL; + FILE *dh_file = NULL; + struct PICA_acc *a = NULL; -if (!(cert_file && pkey_file && dh_param_file && acc)) - return PICA_ERRINVARG; + if (!(cert_file && pkey_file && dh_param_file && acc)) + return PICA_ERRINVARG; -a = *acc = (struct PICA_acc*)calloc(sizeof(struct PICA_acc), 1);//(1) + a = *acc = (struct PICA_acc*)calloc(sizeof(struct PICA_acc), 1);//(1) -if (!a) - return PICA_ERRNOMEM; + if (!a) + return PICA_ERRNOMEM; -a->ctx = SSL_CTX_new(TLSv1_2_method());//(2) + a->ctx = SSL_CTX_new(TLSv1_2_method());//(2) -if (!a->ctx) - { - ret_err=PICA_ERRSSL; - goto error_ret_1; - } + if (!a->ctx) + { + ret_err = PICA_ERRSSL; + goto error_ret_1; + } -dh_file = fopen(dh_param_file, "r"); + dh_file = fopen(dh_param_file, "r"); -if (dh_file) - { - dh = PEM_read_DHparams(dh_file, NULL, NULL, NULL); - fclose(dh_file); - } + if (dh_file) + { + dh = PEM_read_DHparams(dh_file, NULL, NULL, NULL); + fclose(dh_file); + } -if (1 != SSL_CTX_set_tmp_dh(a->ctx, dh)) -{ - ret_err = PICA_ERRSSL; - goto error_ret_2; -} + if (1 != SSL_CTX_set_tmp_dh(a->ctx, dh)) + { + ret_err = PICA_ERRSSL; + goto error_ret_2; + } -DH_free(dh); + DH_free(dh); -SSL_CTX_set_options(a->ctx, SSL_OP_SINGLE_DH_USE); + SSL_CTX_set_options(a->ctx, SSL_OP_SINGLE_DH_USE); -if (!PICA_get_id_from_cert_file(cert_file, a->id)) - { - ret_err = PICA_ERRINVCERT; - goto error_ret_2; - } + if (!PICA_get_id_from_cert_file(cert_file, a->id)) + { + ret_err = PICA_ERRINVCERT; + goto error_ret_2; + } -ret = check_pkey_passphrase(pkey_file, password_cb, a->id); + ret = check_pkey_passphrase(pkey_file, password_cb, a->id); -if (ret != PICA_OK) - { - ret_err = ret; - goto error_ret_2; - } + if (ret != PICA_OK) + { + ret_err = ret; + goto error_ret_2; + } ////<< -if (password_cb) - { - SSL_CTX_set_default_passwd_cb(a->ctx, password_cb); - SSL_CTX_set_default_passwd_cb_userdata(a->ctx, a->id); - } - -ret = SSL_CTX_use_certificate_file(a->ctx, cert_file, SSL_FILETYPE_PEM); - -if (ret != 1) - { - ret_err=PICA_ERRSSL; - goto error_ret_2; - } - -ret = SSL_CTX_use_PrivateKey_file(a->ctx, pkey_file, SSL_FILETYPE_PEM); -if (ret != 1) - { - ret_err = PICA_ERRSSL; - goto error_ret_2; - } + if (password_cb) + { + SSL_CTX_set_default_passwd_cb(a->ctx, password_cb); + SSL_CTX_set_default_passwd_cb_userdata(a->ctx, a->id); + } + + ret = SSL_CTX_use_certificate_file(a->ctx, cert_file, SSL_FILETYPE_PEM); + + if (ret != 1) + { + ret_err = PICA_ERRSSL; + goto error_ret_2; + } + + ret = SSL_CTX_use_PrivateKey_file(a->ctx, pkey_file, SSL_FILETYPE_PEM); + if (ret != 1) + { + ret_err = PICA_ERRSSL; + goto error_ret_2; + } ////<< //ret=SSL_CTX_load_verify_locations(cid->ctx,CA_file,0/*"trustedCA/"*/); //printf("loadverifylocations ret=%i\n",ret);//debug //SSL_CTX_set_client_CA_list(cid->ctx,SSL_load_client_CA_file(CA_file)); -ret = SSL_CTX_set_cipher_list(a->ctx,"DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CAMELLIA256-SHA"); - -if (ret != 1) -{ - ret_err = PICA_ERRSSL; - goto error_ret_2; -} + ret = SSL_CTX_set_cipher_list(a->ctx, "DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CAMELLIA256-SHA"); -return PICA_OK; + if (ret != 1) + { + ret_err = PICA_ERRSSL; + goto error_ret_2; + } + + return PICA_OK; error_ret_2: //(2) -SSL_CTX_free(a->ctx); + SSL_CTX_free(a->ctx); error_ret_1: //(1) -free(a); -*acc = 0; + free(a); + *acc = 0; -return ret_err; + return ret_err; } static int c2n_stage2_sendreq(struct PICA_c2n *c2n) { -struct PICA_proto_msg *mp; + struct PICA_proto_msg *mp; -puts("c2n_stage2_sendreq");//debug + puts("c2n_stage2_sendreq");//debug -mp = c2n_writebuf_push(c2n, PICA_PROTO_INITREQ, PICA_PROTO_INITREQ_SIZE); + mp = c2n_writebuf_push(c2n, PICA_PROTO_INITREQ, PICA_PROTO_INITREQ_SIZE); -if (mp) - { - mp->tail[0] = PICA_PROTO_VER_HIGH; - mp->tail[1] = PICA_PROTO_VER_LOW; - } -else - return PICA_ERRNOMEM; + if (mp) + { + mp->tail[0] = PICA_PROTO_VER_HIGH; + mp->tail[1] = PICA_PROTO_VER_LOW; + } + else + return PICA_ERRNOMEM; -c2n->state = PICA_C2N_STATE_WAITINGREP; + c2n->state = PICA_C2N_STATE_WAITINGREP; -return PICA_OK; + return PICA_OK; } static int c2n_stage3_starttls(struct PICA_c2n *c2n) { -int ret; + int ret; -ret = SSL_set_fd(c2n->ssl_comm, c2n->sck_comm); + ret = SSL_set_fd(c2n->ssl_comm, c2n->sck_comm); -if (ret != 1) - return PICA_ERRSSL; + if (ret != 1) + return PICA_ERRSSL; -ret = SSL_accept(c2n->ssl_comm); + ret = SSL_accept(c2n->ssl_comm); -if (ret == 0) - return PICA_ERRSSL; + if (ret == 0) + return PICA_ERRSSL; -if (ret < 0) - { - ret = SSL_get_error(c2n->ssl_comm, ret); + if (ret < 0) + { + ret = SSL_get_error(c2n->ssl_comm, ret); - if (ret != SSL_ERROR_WANT_READ && ret != SSL_ERROR_WANT_WRITE) - return PICA_ERRSSL; - } + if (ret != SSL_ERROR_WANT_READ && ret != SSL_ERROR_WANT_WRITE) + return PICA_ERRSSL; + } -c2n->state = PICA_C2N_STATE_WAITINGTLS; + c2n->state = PICA_C2N_STATE_WAITINGTLS; -return PICA_OK; + return PICA_OK; } static int c2n_stage4_nodelistrequest(struct PICA_c2n *c2n) { -struct PICA_proto_msg *mp; + struct PICA_proto_msg *mp; -mp = c2n_writebuf_push(c2n, PICA_PROTO_CLNODELISTREQ, PICA_PROTO_CLNODELISTREQ_SIZE); + mp = c2n_writebuf_push(c2n, PICA_PROTO_CLNODELISTREQ, PICA_PROTO_CLNODELISTREQ_SIZE); -if (mp) - { - RAND_bytes(mp->tail, 2); - } -else - return PICA_ERRNOMEM; + if (mp) + { + RAND_bytes(mp->tail, 2); + } + else + return PICA_ERRNOMEM; -c2n->state = PICA_C2N_STATE_CONNECTED; + c2n->state = PICA_C2N_STATE_CONNECTED; -callbacks.c2n_established_cb(c2n); + callbacks.c2n_established_cb(c2n); -return PICA_OK; + return PICA_OK; } /*адрес сервера, сертификат клиента и закрытый ключ*/ @@ -1325,141 +1331,141 @@ return PICA_OK; //.... int PICA_new_c2n(const struct PICA_acc *acc, const char *nodeaddr, - unsigned int port, - struct PICA_c2n **ci) + unsigned int port, + struct PICA_c2n **ci) { -int ret,ret_err; -struct PICA_c2n *cid; -struct sockaddr_in a; + int ret, ret_err; + struct PICA_c2n *cid; + struct sockaddr_in a; -if (!(nodeaddr && acc && port && ci)) - return PICA_ERRINVARG; + if (!(nodeaddr && acc && port && ci)) + return PICA_ERRINVARG; -cid=*ci=(struct PICA_c2n*)calloc(sizeof(struct PICA_c2n),1);//(1) -if (!cid) - return PICA_ERRNOMEM; + cid = *ci = (struct PICA_c2n*)calloc(sizeof(struct PICA_c2n), 1); //(1) + if (!cid) + return PICA_ERRNOMEM; -cid->acc = acc; + cid->acc = acc; -cid->read_buf = calloc(PICA_CONNREADBUFSIZE, 1);//(2) -if (!cid->read_buf) - { - ret_err = PICA_ERRNOMEM; - goto error_ret_1; - } + cid->read_buf = calloc(PICA_CONNREADBUFSIZE, 1);//(2) + if (!cid->read_buf) + { + ret_err = PICA_ERRNOMEM; + goto error_ret_1; + } -cid->ssl_comm=SSL_new(acc->ctx);//(3) + cid->ssl_comm = SSL_new(acc->ctx); //(3) -if (!cid->ssl_comm) + if (!cid->ssl_comm) { - ret_err=PICA_ERRSSL; - goto error_ret_2; + ret_err = PICA_ERRSSL; + goto error_ret_2; } //resolving name -{ - struct addrinfo h,*r; + { + struct addrinfo h, *r; - memset(&h,0,sizeof(struct addrinfo)); + memset(&h, 0, sizeof(struct addrinfo)); - h.ai_flags=0; + h.ai_flags = 0; #ifdef AI_IDN - h.ai_flags = h.ai_flags | AI_IDN; + h.ai_flags = h.ai_flags | AI_IDN; #endif #ifdef AI_ADDRCONFIG - h.ai_flags = h.ai_flags | AI_ADDRCONFIG; + h.ai_flags = h.ai_flags | AI_ADDRCONFIG; #endif - h.ai_family=AF_INET;//CONF - h.ai_socktype=SOCK_STREAM; - h.ai_protocol=IPPROTO_TCP; + h.ai_family = AF_INET; //CONF + h.ai_socktype = SOCK_STREAM; + h.ai_protocol = IPPROTO_TCP; - if (0!=getaddrinfo(nodeaddr,NULL,&h,&r)) - { - ret_err=PICA_ERRDNSRESOLVE; - goto error_ret_4; - } + if (0 != getaddrinfo(nodeaddr, NULL, &h, &r)) + { + ret_err = PICA_ERRDNSRESOLVE; + goto error_ret_4; + } - memset(&a,0,sizeof(a)); - memcpy(&a,r->ai_addr,r->ai_addrlen); - a.sin_family = AF_INET; - //a.sin_addr.s_addr = inet_addr (nodeaddr); - a.sin_port = htons(port); + memset(&a, 0, sizeof(a)); + memcpy(&a, r->ai_addr, r->ai_addrlen); + a.sin_family = AF_INET; + //a.sin_addr.s_addr = inet_addr (nodeaddr); + a.sin_port = htons(port); - freeaddrinfo(r); -} + freeaddrinfo(r); + } -cid->srv_addr=a; + cid->srv_addr = a; -cid->sck_comm=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);//(5) -if (cid->sck_comm==SOCKET_ERROR) + cid->sck_comm = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); //(5) + if (cid->sck_comm == SOCKET_ERROR) { - ret_err=PICA_ERRSOCK; - goto error_ret_3; + ret_err = PICA_ERRSOCK; + goto error_ret_3; } -IOCTLSETNONBLOCKINGSOCKET(cid->sck_comm, 1); + IOCTLSETNONBLOCKINGSOCKET(cid->sck_comm, 1); -cid->state = PICA_C2N_STATE_CONNECTING; + cid->state = PICA_C2N_STATE_CONNECTING; -ret=connect(cid->sck_comm,(struct sockaddr*)&cid->srv_addr,sizeof(cid->srv_addr)); + ret = connect(cid->sck_comm, (struct sockaddr*)&cid->srv_addr, sizeof(cid->srv_addr)); /////////////////state_ -if (ret == 0) - return c2n_stage2_sendreq(cid); + if (ret == 0) + return c2n_stage2_sendreq(cid); -if (ret==SOCKET_ERROR) + if (ret == SOCKET_ERROR) { #ifndef WIN32 - if (errno == EINPROGRESS || errno == EINTR) - return PICA_OK; + if (errno == EINPROGRESS || errno == EINTR) + return PICA_OK; #else - if (WSAGetLastError() == WSAEWOULDBLOCK) - return PICA_OK; + if (WSAGetLastError() == WSAEWOULDBLOCK) + return PICA_OK; #endif - ret_err=PICA_ERRSOCK; - goto error_ret_4; + ret_err = PICA_ERRSOCK; + goto error_ret_4; } -/* -do - { - ret = PICA_write_c2n(cid); - if (ret != PICA_OK) + /* + do { - ret_err = ret; - break; + ret = PICA_write_c2n(cid); + if (ret != PICA_OK) + { + ret_err = ret; + break; + } + ret = PICA_read_c2n(cid); + if (ret != PICA_OK) + { + ret_err = ret; + break; + } + //TODO Timeout } - ret = PICA_read_c2n(cid); - if (ret != PICA_OK) + while (cid->init_resp_ok == 0); + + if (cid->init_resp_ok != 1) { - ret_err = ret; - break; + if (cid->init_resp_ok == -1) + { + if (cid->node_ver_major > PICA_PROTO_VER_HIGH || + (cid->node_ver_major == PICA_PROTO_VER_HIGH && cid->node_ver_minor > PICA_PROTO_VER_LOW)) + ret_err = PICA_ERRPROTONEW; + else + ret_err = PICA_ERRPROTOOLD; + } + goto error_ret_4; } - //TODO Timeout - } -while (cid->init_resp_ok == 0); -if (cid->init_resp_ok != 1) - { - if (cid->init_resp_ok == -1) - { - if (cid->node_ver_major > PICA_PROTO_VER_HIGH || - (cid->node_ver_major == PICA_PROTO_VER_HIGH && cid->node_ver_minor > PICA_PROTO_VER_LOW)) - ret_err = PICA_ERRPROTONEW; - else - ret_err = PICA_ERRPROTOOLD; - } - goto error_ret_4; - } - -//printf("6\n");//debug -*/ /* + //printf("6\n");//debug + */ /* ret=SSL_set_fd(cid->ssl_comm,cid->sck_comm); //printf("SSL_set_fd=%i\n",ret); @@ -1480,167 +1486,167 @@ cid->state = PICA_C2N_STATE_CONNECTED;//<<tail, 2); - } + } } */ -return PICA_OK; + return PICA_OK; error_ret_4: //(4) - SHUTDOWN(cid->sck_comm); - CLOSE(cid->sck_comm); + SHUTDOWN(cid->sck_comm); + CLOSE(cid->sck_comm); error_ret_3: //(3) - SSL_free(cid->ssl_comm); + SSL_free(cid->ssl_comm); error_ret_2: //(2) - free(cid->read_buf); + free(cid->read_buf); error_ret_1: //(1) - free(cid); - *ci=0; + free(cid); + *ci = 0; -return ret_err; + return ret_err; } //создает ИСХОДЯЩИЙ логический зашифрованный канал связи с указанным собеседником, если тот доступен // в данный момент. -int PICA_new_c2c(struct PICA_c2n *ci,const unsigned char *peer_id, struct PICA_listener *l,struct PICA_c2c **chn) +int PICA_new_c2c(struct PICA_c2n *ci, const unsigned char *peer_id, struct PICA_listener *l, struct PICA_c2c **chn) { -struct PICA_proto_msg *mp; -struct PICA_c2c *chnl; + struct PICA_proto_msg *mp; + struct PICA_c2c *chnl; + + if (!(ci && chn)) + return PICA_ERRINVARG; -if (!(ci && chn)) - return PICA_ERRINVARG; + if (!add_chaninfo(ci, chn, peer_id, PICA_c2c_OUTGOING)) + return PICA_ERRNOMEM; -if (!add_chaninfo(ci, chn, peer_id, PICA_c2c_OUTGOING)) - return PICA_ERRNOMEM; + chnl = *chn; -chnl=*chn; + mp = c2n_writebuf_push( ci, PICA_PROTO_CONNREQOUTG, PICA_PROTO_CONNREQOUTG_SIZE); -mp = c2n_writebuf_push( ci, PICA_PROTO_CONNREQOUTG, PICA_PROTO_CONNREQOUTG_SIZE); - if (mp) - { + { memcpy(mp->tail, peer_id, PICA_ID_SIZE); - } + } else - return PICA_ERRNOMEM; + return PICA_ERRNOMEM; -return PICA_OK; + return PICA_OK; } static int process_c2n(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) { -int ret = PICA_OK; + int ret = PICA_OK; //puts("process_c2n()");//debug -switch(c2n->state) - { - case PICA_C2N_STATE_NEW: - break; + switch(c2n->state) + { + case PICA_C2N_STATE_NEW: + break; - case PICA_C2N_STATE_CONNECTING: + case PICA_C2N_STATE_CONNECTING: - if (FD_ISSET(c2n->sck_comm, wfds)) - { - ret = PICA_ERRSOCK; + if (FD_ISSET(c2n->sck_comm, wfds)) + { + ret = PICA_ERRSOCK; - //check if connect() finished successfully + //check if connect() finished successfully #ifndef WIN32 - int optval; - socklen_t optlen = sizeof(optval); - - if (0 == getsockopt(c2n->sck_comm, SOL_SOCKET, SO_ERROR, &optval, &optlen)) - { - if (optval == 0) - { - ret = c2n_stage2_sendreq(c2n); - } - } + int optval; + socklen_t optlen = sizeof(optval); + + if (0 == getsockopt(c2n->sck_comm, SOL_SOCKET, SO_ERROR, &optval, &optlen)) + { + if (optval == 0) + { + ret = c2n_stage2_sendreq(c2n); + } + } #else - if (SOCKET_ERROR == connect(c2n->ssl_comm, (struct sockaddr*)&c2n->srv_addr, sizeof(c2n->srv_addr)) && - WSAEISCONN == WSAGetLastError()) - { - ret = c2n_stage2_sendreq(c2n); - } + if (SOCKET_ERROR == connect(c2n->ssl_comm, (struct sockaddr*)&c2n->srv_addr, sizeof(c2n->srv_addr)) && + WSAEISCONN == WSAGetLastError()) + { + ret = c2n_stage2_sendreq(c2n); + } #endif - } + } - break; + break; - case PICA_C2N_STATE_WAITINGREP: + case PICA_C2N_STATE_WAITINGREP: - if (FD_ISSET(c2n->sck_comm, wfds)) - { - ret = PICA_write_c2n(c2n); - } + if (FD_ISSET(c2n->sck_comm, wfds)) + { + ret = PICA_write_c2n(c2n); + } - if (FD_ISSET(c2n->sck_comm, rfds)) - { - ret = PICA_read_c2n(c2n); - } + if (FD_ISSET(c2n->sck_comm, rfds)) + { + ret = PICA_read_c2n(c2n); + } - if (ret == PICA_OK && c2n->init_resp_ok != 0) - { - if (c2n->init_resp_ok == 1) - ret = c2n_stage3_starttls(c2n); - else - { - if (c2n->node_ver_major > PICA_PROTO_VER_HIGH || - (c2n->node_ver_major == PICA_PROTO_VER_HIGH && c2n->node_ver_minor > PICA_PROTO_VER_LOW)) - ret = PICA_ERRPROTONEW; - else - ret = PICA_ERRPROTOOLD; - } - } + if (ret == PICA_OK && c2n->init_resp_ok != 0) + { + if (c2n->init_resp_ok == 1) + ret = c2n_stage3_starttls(c2n); + else + { + if (c2n->node_ver_major > PICA_PROTO_VER_HIGH || + (c2n->node_ver_major == PICA_PROTO_VER_HIGH && c2n->node_ver_minor > PICA_PROTO_VER_LOW)) + ret = PICA_ERRPROTONEW; + else + ret = PICA_ERRPROTOOLD; + } + } - break; + break; - case PICA_C2N_STATE_WAITINGTLS: + case PICA_C2N_STATE_WAITINGTLS: - if (FD_ISSET(c2n->sck_comm, wfds) || FD_ISSET(c2n->sck_comm, rfds)) - { - int sslret; + if (FD_ISSET(c2n->sck_comm, wfds) || FD_ISSET(c2n->sck_comm, rfds)) + { + int sslret; - sslret = SSL_accept(c2n->ssl_comm); + sslret = SSL_accept(c2n->ssl_comm); - if (sslret == 1) - ret = c2n_stage4_nodelistrequest(c2n); - else if (sslret == 0) - ret = PICA_ERRSSL; - else if (sslret < 0) - { - sslret = SSL_get_error(c2n->ssl_comm, sslret); + if (sslret == 1) + ret = c2n_stage4_nodelistrequest(c2n); + else if (sslret == 0) + ret = PICA_ERRSSL; + else if (sslret < 0) + { + sslret = SSL_get_error(c2n->ssl_comm, sslret); - if (sslret != SSL_ERROR_WANT_READ && sslret != SSL_ERROR_WANT_WRITE) - ret = PICA_ERRSSL; - } - } + if (sslret != SSL_ERROR_WANT_READ && sslret != SSL_ERROR_WANT_WRITE) + ret = PICA_ERRSSL; + } + } - break; + break; - case PICA_C2N_STATE_CONNECTED: + case PICA_C2N_STATE_CONNECTED: - if (FD_ISSET(c2n->sck_comm, wfds)) - ret = PICA_write_c2n(c2n); + if (FD_ISSET(c2n->sck_comm, wfds)) + ret = PICA_write_c2n(c2n); - if (FD_ISSET(c2n->sck_comm, rfds)) - ret = PICA_read_c2n(c2n); + if (FD_ISSET(c2n->sck_comm, rfds)) + ret = PICA_read_c2n(c2n); - break; - } + break; + } -return ret; + return ret; } static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) @@ -1649,355 +1655,355 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) // { // // } -return PICA_OK; + return PICA_OK; } static int process_listener(struct PICA_listener *lst, fd_set *rfds) { -return PICA_OK; + return PICA_OK; } static void fdset_add(fd_set *fds, int fd, int *max) { -FD_SET(fd, fds); + FD_SET(fd, fds); -if (fd > *max) - *max = fd; + if (fd > *max) + *max = fd; } int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listeners, int timeout) { -fd_set rfds, wfds; -struct timeval tv; -int ret, nfds = 0; -struct PICA_c2n **ic2n; -struct PICA_listener **ilst; + fd_set rfds, wfds; + struct timeval tv; + int ret, nfds = 0; + struct PICA_c2n **ic2n; + struct PICA_listener **ilst; //puts("PICA_event_loop");//debug -tv.tv_sec = timeout / 1000; -tv.tv_usec = (timeout % 1000) * 1000; + tv.tv_sec = timeout / 1000; + tv.tv_usec = (timeout % 1000) * 1000; -FD_ZERO(&rfds); -FD_ZERO(&wfds); + FD_ZERO(&rfds); + FD_ZERO(&wfds); -ilst = listeners; + ilst = listeners; -while(ilst && *ilst) - { - fdset_add(&rfds, (*ilst)->sck_listener, &nfds); - ilst++; - } + while(ilst && *ilst) + { + fdset_add(&rfds, (*ilst)->sck_listener, &nfds); + ilst++; + } -ic2n = connections; + ic2n = connections; -while(ic2n && *ic2n) - { - struct PICA_c2c *ic2c; + while(ic2n && *ic2n) + { + struct PICA_c2c *ic2c; - //printf("event_loop: adding c2n %p\n", *ic2n);//debug + //printf("event_loop: adding c2n %p\n", *ic2n);//debug - fdset_add(&rfds, (*ic2n)->sck_comm, &nfds); + fdset_add(&rfds, (*ic2n)->sck_comm, &nfds); - if ((*ic2n)->write_pos || (*ic2n)->state == PICA_C2N_STATE_CONNECTING - || (*ic2n)->state == PICA_C2N_STATE_WAITINGTLS) - fdset_add(&wfds, (*ic2n)->sck_comm, &nfds); + if ((*ic2n)->write_pos || (*ic2n)->state == PICA_C2N_STATE_CONNECTING + || (*ic2n)->state == PICA_C2N_STATE_WAITINGTLS) + fdset_add(&wfds, (*ic2n)->sck_comm, &nfds); - ic2c = (*ic2n)->chan_list_head; + ic2c = (*ic2n)->chan_list_head; - while(ic2c) - { - if (ic2c->state == PICA_C2C_STATE_ACTIVE) - { - fdset_add(&rfds, ic2c->sck_data, &nfds); + while(ic2c) + { + if (ic2c->state == PICA_C2C_STATE_ACTIVE) + { + fdset_add(&rfds, ic2c->sck_data, &nfds); - if (ic2c->write_pos || ic2c->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) - fdset_add(&wfds, ic2c->sck_data, &nfds); - } + if (ic2c->write_pos || ic2c->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) + fdset_add(&wfds, ic2c->sck_data, &nfds); + } - ic2c = ic2c->next; - } + ic2c = ic2c->next; + } - ic2n++; - } + ic2n++; + } -ret = select(nfds + 1, &rfds, &wfds, NULL, &tv); + ret = select(nfds + 1, &rfds, &wfds, NULL, &tv); -if (ret == -1) - { + if (ret == -1) + { #ifndef WIN32 - if (errno == EINTR) - return PICA_OK; - else - return PICA_ERRSOCK; + if (errno == EINTR) + return PICA_OK; + else + return PICA_ERRSOCK; #else #warning "implement handling of select() errors on Windows!" #endif - } + } //printf("select() returned %i\n", ret);//debug //processing listeners, c2n and c2c connections -ilst = listeners; + ilst = listeners; -while(ilst && *ilst) - { - ret = process_listener(*ilst, &rfds); + while(ilst && *ilst) + { + ret = process_listener(*ilst, &rfds); - if (ret != PICA_OK) - { - callbacks.listener_error(*ilst, ret); - PICA_close_listener(*ilst); - } + if (ret != PICA_OK) + { + callbacks.listener_error(*ilst, ret); + PICA_close_listener(*ilst); + } - ilst++; - } + ilst++; + } -ic2n = connections; + ic2n = connections; -while(ic2n && *ic2n) - { - struct PICA_c2c *ic2c; + while(ic2n && *ic2n) + { + struct PICA_c2c *ic2c; - //processing current c2n + //processing current c2n - ret = process_c2n(*ic2n, &rfds, &wfds); + ret = process_c2n(*ic2n, &rfds, &wfds); - if (ret != PICA_OK) - { - if ((*ic2n)->state == PICA_C2N_STATE_CONNECTED) - callbacks.c2n_closed_cb(*ic2n); - else - callbacks.c2n_failed_cb(*ic2n); + if (ret != PICA_OK) + { + if ((*ic2n)->state == PICA_C2N_STATE_CONNECTED) + callbacks.c2n_closed_cb(*ic2n); + else + callbacks.c2n_failed_cb(*ic2n); - PICA_close_c2n(*ic2n); - } - else - { - struct PICA_c2c *kill_ptr = 0; + PICA_close_c2n(*ic2n); + } + else + { + struct PICA_c2c *kill_ptr = 0; - ic2c = (*ic2n)->chan_list_head; + ic2c = (*ic2n)->chan_list_head; - //processing c2c connections associated with current c2n - while(ic2c) - { - ret = process_c2c(ic2c, &rfds, &wfds); + //processing c2c connections associated with current c2n + while(ic2c) + { + ret = process_c2c(ic2c, &rfds, &wfds); - if (ret != PICA_OK) - kill_ptr = ic2c; + if (ret != PICA_OK) + kill_ptr = ic2c; - ic2c = ic2c->next; + ic2c = ic2c->next; - if (kill_ptr) - { - PICA_close_c2c(kill_ptr); - kill_ptr = 0; - } - } - } - ic2n++; - } + if (kill_ptr) + { + PICA_close_c2c(kill_ptr); + kill_ptr = 0; + } + } + } + ic2n++; + } -return PICA_OK; + return PICA_OK; } -int PICA_read(struct PICA_c2n *ci,int timeout) +int PICA_read(struct PICA_c2n *ci, int timeout) { -fd_set fds; -struct timeval tv={0,1000}; -struct PICA_c2c *ipt, *kill_ptr = 0; -int ret,nfds; + fd_set fds; + struct timeval tv = {0, 1000}; + struct PICA_c2c *ipt, *kill_ptr = 0; + int ret, nfds; //puts("PICA_read<<");//debug -tv.tv_usec=timeout; + tv.tv_usec = timeout; -FD_ZERO(&fds); + FD_ZERO(&fds); -nfds=ci->sck_comm; -FD_SET(ci->sck_comm,&fds); + nfds = ci->sck_comm; + FD_SET(ci->sck_comm, &fds); -ipt=ci->chan_list_head; + ipt = ci->chan_list_head; -while(ipt) + while(ipt) { - if (ipt->state==PICA_C2C_STATE_ACTIVE) + if (ipt->state == PICA_C2C_STATE_ACTIVE) { - FD_SET(ipt->sck_data,&fds); + FD_SET(ipt->sck_data, &fds); - if (ipt->sck_data>nfds) - nfds=ipt->sck_data; - } + if (ipt->sck_data > nfds) + nfds = ipt->sck_data; + } - if (ipt->state != PICA_C2C_STATE_ACTIVE && (time(0) - ipt->timestamp) > PICA_CHAN_ACTIVATE_TIMEOUT) + if (ipt->state != PICA_C2C_STATE_ACTIVE && (time(0) - ipt->timestamp) > PICA_CHAN_ACTIVATE_TIMEOUT) { - kill_ptr = ipt; + kill_ptr = ipt; } - ipt=ipt->next; + ipt = ipt->next; - if (kill_ptr) + if (kill_ptr) { - PICA_close_c2c(kill_ptr); - kill_ptr = 0; + PICA_close_c2c(kill_ptr); + kill_ptr = 0; } } //#warning "make sockets non-blocking!!!!" -ret=select(nfds+1,&fds,0,0,&tv); + ret = select(nfds + 1, &fds, 0, 0, &tv); -if (ret>0) + if (ret > 0) { - - if (FD_ISSET(ci->sck_comm,&fds)) + + if (FD_ISSET(ci->sck_comm, &fds)) { - ret=PICA_read_c2n(ci); - if (ret!=PICA_OK) - return ret; + ret = PICA_read_c2n(ci); + if (ret != PICA_OK) + return ret; } - ipt=ci->chan_list_head; - while(ipt) + ipt = ci->chan_list_head; + while(ipt) { - if (ipt->state==PICA_C2C_STATE_ACTIVE && FD_ISSET(ipt->sck_data, &fds)) + if (ipt->state == PICA_C2C_STATE_ACTIVE && FD_ISSET(ipt->sck_data, &fds)) { - if (PICA_OK != (ret = PICA_read_c2c(ipt)) ) + if (PICA_OK != (ret = PICA_read_c2c(ipt)) ) { - puts("PICA_read_c2c() failed");//debug - callbacks.c2c_closed_cb(ipt->peer_id, ret); - kill_ptr = ipt; + puts("PICA_read_c2c() failed");//debug + callbacks.c2c_closed_cb(ipt->peer_id, ret); + kill_ptr = ipt; } - + } - - ipt=ipt->next; - if (kill_ptr) + ipt = ipt->next; + + if (kill_ptr) { - PICA_close_c2c(kill_ptr); - kill_ptr = 0; + PICA_close_c2c(kill_ptr); + kill_ptr = 0; } } } //puts("PICA_read>>");//debug -return PICA_OK; + return PICA_OK; } int PICA_write(struct PICA_c2n *ci) { -struct PICA_c2c *ipt, *kill_ptr = 0; -int ret = PICA_OK; + struct PICA_c2c *ipt, *kill_ptr = 0; + int ret = PICA_OK; //puts("PICA_write>>");//debug -if (ci->write_pos) - ret = PICA_write_c2n(ci); + if (ci->write_pos) + ret = PICA_write_c2n(ci); -if (PICA_OK != ret) - return ret; + if (PICA_OK != ret) + return ret; -ipt=ci->chan_list_head; + ipt = ci->chan_list_head; -while(ipt) + while(ipt) { - if (ipt->write_pos) + if (ipt->write_pos) { - if (PICA_OK != (ret = PICA_write_c2c(ipt))) + if (PICA_OK != (ret = PICA_write_c2c(ipt))) { - fprintf(stderr,"PICA_write_c2c() failed, ret = %i\n", ret);//debug - callbacks.c2c_closed_cb(ipt->peer_id, ret); - kill_ptr = ipt; + fprintf(stderr, "PICA_write_c2c() failed, ret = %i\n", ret); //debug + callbacks.c2c_closed_cb(ipt->peer_id, ret); + kill_ptr = ipt; + } + } + else if (ipt->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) + { + if (PICA_OK != (ret = PICA_send_file_fragment(ipt))) + { + callbacks.c2c_closed_cb(ipt->peer_id, ret); + kill_ptr = ipt; } } - else if (ipt->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) - { - if (PICA_OK != (ret = PICA_send_file_fragment(ipt))) - { - callbacks.c2c_closed_cb(ipt->peer_id, ret); - kill_ptr = ipt; - } - } - ipt = ipt->next; - - if (kill_ptr) + ipt = ipt->next; + + if (kill_ptr) { - PICA_close_c2c(kill_ptr); - kill_ptr = 0; + PICA_close_c2c(kill_ptr); + kill_ptr = 0; } } //puts("PICA_write<<");//debug -return PICA_OK; + return PICA_OK; } int PICA_write_socket(SOCKET s, unsigned char *buf, unsigned int *ppos) { -int ret; + int ret; -if (*ppos > 0 ) + if (*ppos > 0 ) { - ret = send( s, buf, *ppos, MSG_NOSIGNAL); + ret = send( s, buf, *ppos, MSG_NOSIGNAL); - if (ret > 0) + if (ret > 0) { - if (ret < *ppos) - memmove( buf, buf + ret, *ppos - ret); - *ppos -= ret; + if (ret < *ppos) + memmove( buf, buf + ret, *ppos - ret); + *ppos -= ret; } - - if (ret < 0) + + if (ret < 0) { #ifdef WIN32 - ret = WSAGetLastError(); - if (! (ret == WSAEWOULDBLOCK || ret == WSAENOBUFS)) + ret = WSAGetLastError(); + if (! (ret == WSAEWOULDBLOCK || ret == WSAENOBUFS)) #else - ret = errno; - if (! (ret == EAGAIN || ret == ENOBUFS || ret == EINTR)) + ret = errno; + if (! (ret == EAGAIN || ret == ENOBUFS || ret == EINTR)) #endif - return PICA_ERRSOCK; + return PICA_ERRSOCK; } - if (ret == 0) - return PICA_ERRSERV; - + if (ret == 0) + return PICA_ERRSERV; + } -return PICA_OK; + return PICA_OK; } int PICA_write_ssl(SSL *ssl, unsigned char *buf, unsigned int *ppos, unsigned int *btw) { -int ret; + int ret; -if (*ppos > 0 ) + if (*ppos > 0 ) { - if (*btw == 0) - *btw = *ppos; + if (*btw == 0) + *btw = *ppos; - ret = SSL_write( ssl, buf, *btw); - - if (ret > 0) + ret = SSL_write( ssl, buf, *btw); + + if (ret > 0) { - if (ret < *ppos) - memmove( buf, buf + ret, *ppos - ret); - *ppos -= ret; - *btw = 0; + if (ret < *ppos) + memmove( buf, buf + ret, *ppos - ret); + *ppos -= ret; + *btw = 0; } - - if (ret < 0) + + if (ret < 0) { - ret = SSL_get_error( ssl, ret); - if (! (ret == SSL_ERROR_WANT_WRITE || ret == SSL_ERROR_WANT_READ)) + ret = SSL_get_error( ssl, ret); + if (! (ret == SSL_ERROR_WANT_WRITE || ret == SSL_ERROR_WANT_READ)) return PICA_ERRSSL; } - if (ret == 0) - return PICA_ERRSERV; - + if (ret == 0) + return PICA_ERRSERV; + } -return PICA_OK; + return PICA_OK; } //int PICA_read_socket() @@ -2005,41 +2011,41 @@ return PICA_OK; int PICA_write_c2n(struct PICA_c2n *ci) { -int ret = PICA_ERRINVARG; + int ret = PICA_ERRINVARG; -if (PICA_C2N_STATE_WAITINGREP == ci->state) - ret = PICA_write_socket( ci->sck_comm, ci->write_buf, &ci->write_pos); -else if (PICA_C2N_STATE_CONNECTED == ci->state) - ret = PICA_write_ssl( ci->ssl_comm, ci->write_buf, &ci->write_pos, &ci->write_sslbytestowrite); + if (PICA_C2N_STATE_WAITINGREP == ci->state) + ret = PICA_write_socket( ci->sck_comm, ci->write_buf, &ci->write_pos); + else if (PICA_C2N_STATE_CONNECTED == ci->state) + ret = PICA_write_ssl( ci->ssl_comm, ci->write_buf, &ci->write_pos, &ci->write_sslbytestowrite); -return ret; + return ret; } int PICA_write_c2c(struct PICA_c2c *chn) { -int ret = PICA_ERRINVARG; + int ret = PICA_ERRINVARG; -if (PICA_C2C_STATE_ACTIVE != chn->state) - ret = PICA_write_socket( chn->sck_data, chn->write_buf, &chn->write_pos); -else - ret = PICA_write_ssl( chn->ssl, chn->write_buf, &chn->write_pos, &chn->write_sslbytestowrite); + if (PICA_C2C_STATE_ACTIVE != chn->state) + ret = PICA_write_socket( chn->sck_data, chn->write_buf, &chn->write_pos); + else + ret = PICA_write_ssl( chn->ssl, chn->write_buf, &chn->write_pos, &chn->write_sslbytestowrite); -return ret; + return ret; } int PICA_read_socket(SOCKET s, unsigned char *buf, unsigned int *ppos, unsigned int size) { -int ret; + int ret; -ret = recv(s, buf + *ppos, size - *ppos, 0); + ret = recv(s, buf + *ppos, size - *ppos, 0); -if (ret == 0) - return PICA_ERRDISCONNECT; + if (ret == 0) + return PICA_ERRDISCONNECT; -if (ret < 0) + if (ret < 0) { #ifdef WIN32 - switch(WSAGetLastError()) + switch(WSAGetLastError()) { case WSAEINTR: case WSAEINPROGRESS: @@ -2049,517 +2055,517 @@ if (ret < 0) return PICA_ERRSOCK; } #else - switch(errno) + switch(errno) { case EAGAIN : #if EAGAIN != EWOULDBLOCK case EWOULDBLOCK: #endif case EINTR: - break; - + break; + default: return PICA_ERRSOCK;//ERR_CHECK } #endif } - -if (ret > 0) + + if (ret > 0) { - *ppos += ret; + *ppos += ret; } - -return PICA_OK; + + return PICA_OK; } int PICA_read_ssl(SSL *ssl, unsigned char *buf, unsigned int *ppos, unsigned int size) { -int ret; + int ret; -ret = SSL_read(ssl, buf + *ppos, size - *ppos); + ret = SSL_read(ssl, buf + *ppos, size - *ppos); -if (!ret) - return PICA_ERRSSL; + if (!ret) + return PICA_ERRSSL; -if (ret < 0) - switch(SSL_get_error(ssl, ret)) + if (ret < 0) + switch(SSL_get_error(ssl, ret)) { case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_READ: - break; + break; default: - return PICA_ERRSSL; + return PICA_ERRSSL; }; - -if (ret > 0) + + if (ret > 0) { - *ppos += ret; + *ppos += ret; } - -return PICA_OK; + + return PICA_OK; } int PICA_read_c2c(struct PICA_c2c *chn) { -int ret; + int ret; -if (chn->state != PICA_C2C_STATE_ACTIVE) - return PICA_OK;// ??? + if (chn->state != PICA_C2C_STATE_ACTIVE) + return PICA_OK;// ??? //ret = SSL_read(chn->ssl , chn->read_buf + chn->read_pos, PICA_CHANREADBUFSIZE - chn->read_pos); -ret = PICA_read_ssl(chn->ssl, chn->read_buf, &chn->read_pos, PICA_CHANREADBUFSIZE); - -if (ret == PICA_OK) + ret = PICA_read_ssl(chn->ssl, chn->read_buf, &chn->read_pos, PICA_CHANREADBUFSIZE); + + if (ret == PICA_OK) { - if(!PICA_processdatastream(chn->read_buf, &(chn->read_pos ), chn, c2c_messages, MSGINFO_MSGSNUM(c2c_messages))) - return PICA_ERRSERV; + if(!PICA_processdatastream(chn->read_buf, &(chn->read_pos ), chn, c2c_messages, MSGINFO_MSGSNUM(c2c_messages))) + return PICA_ERRSERV; } -return ret; + return ret; } //функция читает и обрабатывает данные, приходящие от сервера по управляющему соединению. -int PICA_read_c2n(struct PICA_c2n *ci) +int PICA_read_c2n(struct PICA_c2n *ci) { -int ret; + int ret; //ret=SSL_read(ci->ssl_comm, ci->read_buf + ci->read_pos, PICA_CONNREADBUFSIZE - ci->read_pos); -if (PICA_C2N_STATE_WAITINGREP == ci->state) - ret = PICA_read_socket(ci->sck_comm, ci->read_buf, &ci->read_pos, PICA_CONNREADBUFSIZE); -else if (PICA_C2N_STATE_CONNECTED == ci->state) - ret = PICA_read_ssl(ci->ssl_comm, ci->read_buf, &ci->read_pos, PICA_CONNREADBUFSIZE); + if (PICA_C2N_STATE_WAITINGREP == ci->state) + ret = PICA_read_socket(ci->sck_comm, ci->read_buf, &ci->read_pos, PICA_CONNREADBUFSIZE); + else if (PICA_C2N_STATE_CONNECTED == ci->state) + ret = PICA_read_ssl(ci->ssl_comm, ci->read_buf, &ci->read_pos, PICA_CONNREADBUFSIZE); -if (ret == PICA_OK) + if (ret == PICA_OK) { - if (PICA_C2N_STATE_WAITINGREP == ci->state) - if(!PICA_processdatastream( ci->read_buf, &(ci->read_pos), ci, c2n_init_messages, MSGINFO_MSGSNUM(c2n_init_messages))) - return PICA_ERRSERV; - - if (PICA_C2N_STATE_CONNECTED == ci->state) - if(!PICA_processdatastream( ci->read_buf, &(ci->read_pos), ci, c2n_messages, MSGINFO_MSGSNUM(c2n_messages))) - return PICA_ERRSERV; + if (PICA_C2N_STATE_WAITINGREP == ci->state) + if(!PICA_processdatastream( ci->read_buf, &(ci->read_pos), ci, c2n_init_messages, MSGINFO_MSGSNUM(c2n_init_messages))) + return PICA_ERRSERV; + + if (PICA_C2N_STATE_CONNECTED == ci->state) + if(!PICA_processdatastream( ci->read_buf, &(ci->read_pos), ci, c2n_messages, MSGINFO_MSGSNUM(c2n_messages))) + return PICA_ERRSERV; } -return ret; -} + return ret; +} struct PICA_proto_msg* c2n_writebuf_push(struct PICA_c2n *ci, unsigned int msgid, unsigned int size) { -struct PICA_proto_msg *mp; - -if (! ci->write_buf) + struct PICA_proto_msg *mp; + + if (! ci->write_buf) { - ci->write_buf = calloc(PICA_CONNWRITEBUFSIZE, 1); - if (!ci->write_buf) - return 0; - ci->write_buflen = PICA_CONNWRITEBUFSIZE; + ci->write_buf = calloc(PICA_CONNWRITEBUFSIZE, 1); + if (!ci->write_buf) + return 0; + ci->write_buflen = PICA_CONNWRITEBUFSIZE; } - -if (ci->write_buflen - ci->write_pos < size) + + if (ci->write_buflen - ci->write_pos < size) { - unsigned char*p; - p = realloc(ci->write_buf, size + ci->write_pos); - - if (p) + unsigned char*p; + p = realloc(ci->write_buf, size + ci->write_pos); + + if (p) { - ci->write_buf = p; - ci->write_buflen = size + ci->write_pos; + ci->write_buf = p; + ci->write_buflen = size + ci->write_pos; } - else - return 0; + else + return 0; } - -mp = (struct PICA_proto_msg *)(ci->write_buf + ci->write_pos); -mp->head[0] = mp->head[1] = msgid; -ci->write_pos += size; -return mp; + mp = (struct PICA_proto_msg *)(ci->write_buf + ci->write_pos); + mp->head[0] = mp->head[1] = msgid; + ci->write_pos += size; + + return mp; } struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned int msgid, unsigned int size) { -struct PICA_proto_msg *mp; - -if (! chn->write_buf) + struct PICA_proto_msg *mp; + + if (! chn->write_buf) { - chn->write_buf = calloc(PICA_CHANWRITEBUFSIZE, 1); - if (!chn->write_buf) - return 0; - chn->write_buflen = PICA_CHANWRITEBUFSIZE; + chn->write_buf = calloc(PICA_CHANWRITEBUFSIZE, 1); + if (!chn->write_buf) + return 0; + chn->write_buflen = PICA_CHANWRITEBUFSIZE; } - -if (chn->write_buflen - chn->write_pos < size) + + if (chn->write_buflen - chn->write_pos < size) { - unsigned char*p; - p = realloc(chn->write_buf, size + chn->write_pos); - - if (p) + unsigned char*p; + p = realloc(chn->write_buf, size + chn->write_pos); + + if (p) { - chn->write_buf = p; - chn->write_buflen = size + chn->write_pos; + chn->write_buf = p; + chn->write_buflen = size + chn->write_pos; } - else - return 0; + else + return 0; } - -mp = (struct PICA_proto_msg *)(chn->write_buf + chn->write_pos); -mp->head[0] = mp->head[1] = msgid; -chn->write_pos += size; -return mp; + mp = (struct PICA_proto_msg *)(chn->write_buf + chn->write_pos); + mp->head[0] = mp->head[1] = msgid; + chn->write_pos += size; + + return mp; } -int PICA_send_msg(struct PICA_c2c *chn, char *buf,unsigned int len) +int PICA_send_msg(struct PICA_c2c *chn, char *buf, unsigned int len) { -struct PICA_proto_msg *mp; + struct PICA_proto_msg *mp; -if (len > PICA_PROTO_C2CMSG_MAXDATASIZE) - return PICA_ERRMSGSIZE; + if (len > PICA_PROTO_C2CMSG_MAXDATASIZE) + return PICA_ERRMSGSIZE; -if ((mp = c2c_writebuf_push(chn, PICA_PROTO_MSGUTF8, len + 4))) + if ((mp = c2c_writebuf_push(chn, PICA_PROTO_MSGUTF8, len + 4))) { - *((uint16_t*)mp->tail) = len; - memcpy(mp->tail + 2, buf, len); + *((uint16_t*)mp->tail) = len; + memcpy(mp->tail + 2, buf, len); } -else - return PICA_ERRNOMEM; + else + return PICA_ERRNOMEM; -return PICA_OK; + return PICA_OK; } int PICA_send_file(struct PICA_c2c *chn, const char *filepath) { -struct PICA_proto_msg *mp; -size_t namelen; -uint64_t file_size; -int ret; -const char *filename;//file name part of the filepath + struct PICA_proto_msg *mp; + size_t namelen; + uint64_t file_size; + int ret; + const char *filename;//file name part of the filepath -if (chn->sendfilestate != PICA_CHANSENDFILESTATE_IDLE) - return PICA_ERRFILETRANSFERINPROGRESS; + if (chn->sendfilestate != PICA_CHANSENDFILESTATE_IDLE) + return PICA_ERRFILETRANSFERINPROGRESS; -if (filepath == NULL) - return PICA_ERRINVFILENAME; + if (filepath == NULL) + return PICA_ERRINVFILENAME; #ifndef WIN32 -filename = strrchr(filepath, '/'); + filename = strrchr(filepath, '/'); #else -filename = strrchr(filepath, '\\'); + filename = strrchr(filepath, '\\'); #endif -if (filename) - filename++; -else - filename = filepath; + if (filename) + filename++; + else + filename = filepath; -namelen = strlen(filename); + namelen = strlen(filename); -if (namelen == 0 || namelen > PICA_PROTO_C2CMSG_MAXFILENAMESIZE) - return PICA_ERRINVFILENAME; + if (namelen == 0 || namelen > PICA_PROTO_C2CMSG_MAXFILENAMESIZE) + return PICA_ERRINVFILENAME; -if ((ret = PICA_sendfile_open_read(chn, filepath, &file_size)) != PICA_OK) - return ret; + if ((ret = PICA_sendfile_open_read(chn, filepath, &file_size)) != PICA_OK) + return ret; -if ((mp = c2c_writebuf_push(chn, PICA_PROTO_SENDFILEREQUEST, namelen + 12))) + if ((mp = c2c_writebuf_push(chn, PICA_PROTO_SENDFILEREQUEST, namelen + 12))) { - *((uint16_t*)mp->tail) = namelen + 8; - *((uint64_t*)(mp->tail + 2)) = file_size; + *((uint16_t*)mp->tail) = namelen + 8; + *((uint64_t*)(mp->tail + 2)) = file_size; - memcpy(mp->tail + 10, filename, namelen); + memcpy(mp->tail + 10, filename, namelen); } -else - return PICA_ERRNOMEM; + else + return PICA_ERRNOMEM; -chn->sendfilestate = PICA_CHANSENDFILESTATE_SENTREQ; -chn->sendfile_size = file_size; -chn->sendfile_pos = 0; + chn->sendfilestate = PICA_CHANSENDFILESTATE_SENTREQ; + chn->sendfile_size = file_size; + chn->sendfile_pos = 0; -return PICA_OK; + return PICA_OK; } int PICA_pause_file(struct PICA_c2c *chan, int sending) { -int senderctl = PICA_PROTO_FILECONTROL_VOID; -int receiverctl = PICA_PROTO_FILECONTROL_VOID; + int senderctl = PICA_PROTO_FILECONTROL_VOID; + int receiverctl = PICA_PROTO_FILECONTROL_VOID; -fprintf(stderr, "PICA_pause_file(%p, %i)\n", chan, sending);//debug + fprintf(stderr, "PICA_pause_file(%p, %i)\n", chan, sending);//debug -if (sending) - { - if (chan->sendfilestate != PICA_CHANSENDFILESTATE_SENDING) - return PICA_ERRINVARG; + if (sending) + { + if (chan->sendfilestate != PICA_CHANSENDFILESTATE_SENDING) + return PICA_ERRINVARG; - chan->sendfilestate = PICA_CHANSENDFILESTATE_PAUSED; + chan->sendfilestate = PICA_CHANSENDFILESTATE_PAUSED; - senderctl = PICA_PROTO_FILECONTROL_PAUSE; - } - else - { - if (chan->recvfilestate != PICA_CHANRECVFILESTATE_RECEIVING) - return PICA_ERRINVARG; + senderctl = PICA_PROTO_FILECONTROL_PAUSE; + } + else + { + if (chan->recvfilestate != PICA_CHANRECVFILESTATE_RECEIVING) + return PICA_ERRINVARG; - chan->recvfilestate = PICA_CHANRECVFILESTATE_PAUSED; + chan->recvfilestate = PICA_CHANRECVFILESTATE_PAUSED; - receiverctl = PICA_PROTO_FILECONTROL_PAUSE; - } + receiverctl = PICA_PROTO_FILECONTROL_PAUSE; + } -return PICA_send_filecontrol(chan, senderctl, receiverctl); + return PICA_send_filecontrol(chan, senderctl, receiverctl); } int PICA_resume_file(struct PICA_c2c *chan, int sending) { -int senderctl = PICA_PROTO_FILECONTROL_VOID; -int receiverctl = PICA_PROTO_FILECONTROL_VOID; + int senderctl = PICA_PROTO_FILECONTROL_VOID; + int receiverctl = PICA_PROTO_FILECONTROL_VOID; -if (sending) - { - if (chan->sendfilestate != PICA_CHANSENDFILESTATE_PAUSED) - return PICA_ERRINVARG; + if (sending) + { + if (chan->sendfilestate != PICA_CHANSENDFILESTATE_PAUSED) + return PICA_ERRINVARG; - chan->sendfilestate = PICA_CHANSENDFILESTATE_SENDING; + chan->sendfilestate = PICA_CHANSENDFILESTATE_SENDING; - senderctl = PICA_PROTO_FILECONTROL_RESUME; - } - else - { - if (chan->recvfilestate != PICA_CHANRECVFILESTATE_PAUSED) - return PICA_ERRINVARG; + senderctl = PICA_PROTO_FILECONTROL_RESUME; + } + else + { + if (chan->recvfilestate != PICA_CHANRECVFILESTATE_PAUSED) + return PICA_ERRINVARG; - chan->recvfilestate = PICA_CHANRECVFILESTATE_RECEIVING; + chan->recvfilestate = PICA_CHANRECVFILESTATE_RECEIVING; - receiverctl = PICA_PROTO_FILECONTROL_RESUME; - } + receiverctl = PICA_PROTO_FILECONTROL_RESUME; + } -return PICA_send_filecontrol(chan, senderctl, receiverctl); + return PICA_send_filecontrol(chan, senderctl, receiverctl); } int PICA_cancel_file(struct PICA_c2c *chan, int sending) { -int senderctl = PICA_PROTO_FILECONTROL_VOID; -int receiverctl = PICA_PROTO_FILECONTROL_VOID; + int senderctl = PICA_PROTO_FILECONTROL_VOID; + int receiverctl = PICA_PROTO_FILECONTROL_VOID; -if (sending) - { - if (chan->sendfilestate != PICA_CHANSENDFILESTATE_SENDING - && chan->sendfilestate != PICA_CHANSENDFILESTATE_PAUSED) - return PICA_ERRINVARG; + if (sending) + { + if (chan->sendfilestate != PICA_CHANSENDFILESTATE_SENDING + && chan->sendfilestate != PICA_CHANSENDFILESTATE_PAUSED) + return PICA_ERRINVARG; - fclose(chan->sendfile_stream); - chan->sendfile_stream = NULL; - chan->sendfilestate = PICA_CHANSENDFILESTATE_IDLE; + fclose(chan->sendfile_stream); + chan->sendfile_stream = NULL; + chan->sendfilestate = PICA_CHANSENDFILESTATE_IDLE; - senderctl = PICA_PROTO_FILECONTROL_CANCEL; - } - else - { - if (chan->recvfilestate != PICA_CHANRECVFILESTATE_RECEIVING - && chan->recvfilestate != PICA_CHANRECVFILESTATE_PAUSED) - return PICA_ERRINVARG; + senderctl = PICA_PROTO_FILECONTROL_CANCEL; + } + else + { + if (chan->recvfilestate != PICA_CHANRECVFILESTATE_RECEIVING + && chan->recvfilestate != PICA_CHANRECVFILESTATE_PAUSED) + return PICA_ERRINVARG; - fclose(chan->recvfile_stream); - chan->recvfile_stream = NULL; - chan->recvfilestate = PICA_CHANRECVFILESTATE_IDLE; + fclose(chan->recvfile_stream); + chan->recvfile_stream = NULL; + chan->recvfilestate = PICA_CHANRECVFILESTATE_IDLE; - receiverctl = PICA_PROTO_FILECONTROL_CANCEL; - } + receiverctl = PICA_PROTO_FILECONTROL_CANCEL; + } -return PICA_send_filecontrol(chan, senderctl, receiverctl); + return PICA_send_filecontrol(chan, senderctl, receiverctl); } int PICA_send_filecontrol(struct PICA_c2c *chan, int senderctl, int receiverctl) { -struct PICA_proto_msg *mp; + struct PICA_proto_msg *mp; -fprintf(stderr, "PICA_send_filecontrol(%p, %i, %i)\n", chan, senderctl, receiverctl);//debug + fprintf(stderr, "PICA_send_filecontrol(%p, %i, %i)\n", chan, senderctl, receiverctl);//debug -if ((mp = c2c_writebuf_push(chan, PICA_PROTO_FILECONTROL, PICA_PROTO_FILECONTROL_SIZE))) - { - mp->tail[0] = senderctl; //sender's command - mp->tail[1] = receiverctl; //receiver's command - } -else - return PICA_ERRNOMEM; + if ((mp = c2c_writebuf_push(chan, PICA_PROTO_FILECONTROL, PICA_PROTO_FILECONTROL_SIZE))) + { + mp->tail[0] = senderctl; //sender's command + mp->tail[1] = receiverctl; //receiver's command + } + else + return PICA_ERRNOMEM; -return PICA_OK; + return PICA_OK; } int PICA_send_file_fragment(struct PICA_c2c *chn) { -struct PICA_proto_msg *mp; -char buf[PICA_FILEFRAGMENTSIZE]; -size_t fragment_size; + struct PICA_proto_msg *mp; + char buf[PICA_FILEFRAGMENTSIZE]; + size_t fragment_size; -if (chn->sendfilestate != PICA_CHANSENDFILESTATE_SENDING) - return PICA_ERRFILETRANSFERNOTINPROGRESS; + if (chn->sendfilestate != PICA_CHANSENDFILESTATE_SENDING) + return PICA_ERRFILETRANSFERNOTINPROGRESS; -fragment_size = fread(buf, 1, PICA_FILEFRAGMENTSIZE, chn->sendfile_stream); + fragment_size = fread(buf, 1, PICA_FILEFRAGMENTSIZE, chn->sendfile_stream); -if (fragment_size == 0) - { - fclose(chn->sendfile_stream); - chn->sendfile_stream = NULL; - chn->sendfilestate = PICA_CHANSENDFILESTATE_IDLE; + if (fragment_size == 0) + { + fclose(chn->sendfile_stream); + chn->sendfile_stream = NULL; + chn->sendfilestate = PICA_CHANSENDFILESTATE_IDLE; - PICA_send_filecontrol(chn, PICA_PROTO_FILECONTROL_IOERROR, PICA_PROTO_FILECONTROL_VOID); + PICA_send_filecontrol(chn, PICA_PROTO_FILECONTROL_IOERROR, PICA_PROTO_FILECONTROL_VOID); - return PICA_ERRFILEIO; - } + return PICA_ERRFILEIO; + } -if ((mp = c2c_writebuf_push(chn, PICA_PROTO_FILEFRAGMENT, fragment_size + 4))) - { - *((uint16_t*)mp->tail) = fragment_size; + if ((mp = c2c_writebuf_push(chn, PICA_PROTO_FILEFRAGMENT, fragment_size + 4))) + { + *((uint16_t*)mp->tail) = fragment_size; - memcpy(mp->tail + 2, buf, fragment_size); - } -else - { - return PICA_ERRNOMEM; - } + memcpy(mp->tail + 2, buf, fragment_size); + } + else + { + return PICA_ERRNOMEM; + } -chn->sendfile_pos += fragment_size; + chn->sendfile_pos += fragment_size; -callbacks.file_progress(chn->peer_id, chn->sendfile_pos, 0); + callbacks.file_progress(chn->peer_id, chn->sendfile_pos, 0); -if (chn->sendfile_pos >= chn->sendfile_size) - { - chn->sendfilestate = PICA_CHANSENDFILESTATE_IDLE; - fclose(chn->sendfile_stream); - chn->sendfile_stream = NULL; + if (chn->sendfile_pos >= chn->sendfile_size) + { + chn->sendfilestate = PICA_CHANSENDFILESTATE_IDLE; + fclose(chn->sendfile_stream); + chn->sendfile_stream = NULL; - callbacks.file_finished(chn->peer_id, 1); - } + callbacks.file_finished(chn->peer_id, 1); + } -if (chn->sendfile_pos > chn->sendfile_size) - return PICA_ERRFILEFRAGMENTCROSSEDSIZE; + if (chn->sendfile_pos > chn->sendfile_size) + return PICA_ERRFILEFRAGMENTCROSSEDSIZE; -return PICA_OK; + return PICA_OK; } void PICA_close_c2c(struct PICA_c2c *chn) { -struct PICA_c2c *ipt; + struct PICA_c2c *ipt; -fprintf(stderr, "PICA_close_c2c(%p)\n", chn);//debug - -ipt=chn->conn->chan_list_head; + fprintf(stderr, "PICA_close_c2c(%p)\n", chn);//debug + + ipt = chn->conn->chan_list_head; //puts("PICA_close_c2c_chkp0");//debug -while(ipt) + while(ipt) { - if (ipt==chn) + if (ipt == chn) { - if (ipt->next) - ipt->next->prev=ipt->prev; - else - chn->conn->chan_list_end=ipt->prev; + if (ipt->next) + ipt->next->prev = ipt->prev; + else + chn->conn->chan_list_end = ipt->prev; - if (ipt->prev) - ipt->prev->next=ipt->next; - else - chn->conn->chan_list_head=ipt->next; + if (ipt->prev) + ipt->prev->next = ipt->next; + else + chn->conn->chan_list_head = ipt->next; - break; + break; } - ipt=ipt->next; + ipt = ipt->next; } //puts("PICA_close_c2c_chkp1");//debug -if (chn -> sendfile_stream) - fclose(chn -> sendfile_stream); + if (chn -> sendfile_stream) + fclose(chn -> sendfile_stream); -if (chn -> recvfile_stream) - fclose(chn -> recvfile_stream); + if (chn -> recvfile_stream) + fclose(chn -> recvfile_stream); -if (chn -> read_buf) - free(chn -> read_buf); + if (chn -> read_buf) + free(chn -> read_buf); -if (chn -> write_buf) - free(chn -> write_buf); + if (chn -> write_buf) + free(chn -> write_buf); -if (chn->peer_cert) - X509_free(chn->peer_cert); + if (chn->peer_cert) + X509_free(chn->peer_cert); //puts("PICA_close_c2c_chkp2");//debug -if (chn->ssl) - SSL_shutdown(chn->ssl); - //puts("PICA_close_c2c_chkp3");//debug + if (chn->ssl) + SSL_shutdown(chn->ssl); + //puts("PICA_close_c2c_chkp3");//debug -if (chn->ssl) + if (chn->ssl) { - //printf("3 SSL_free(%X)\n",chn->ssl);//debug - SSL_free(chn->ssl); + //printf("3 SSL_free(%X)\n",chn->ssl);//debug + SSL_free(chn->ssl); } //puts("PICA_close_c2c_chkp4");//debug -SHUTDOWN(chn->sck_data); + SHUTDOWN(chn->sck_data); //puts("PICA_close_c2c_chkp5");//debug -CLOSE(chn->sck_data); + CLOSE(chn->sck_data); //puts("PICA_close_c2c_chkp6");//debug -free(chn); + free(chn); //puts("PICA_close_c2c_chkp7");//debug } void PICA_close_c2n(struct PICA_c2n *cid) { -struct PICA_c2c *ipt; + struct PICA_c2c *ipt; -while((ipt = cid->chan_list_head)) - PICA_close_c2c(ipt); + while((ipt = cid->chan_list_head)) + PICA_close_c2c(ipt); -SSL_shutdown(cid->ssl_comm); + SSL_shutdown(cid->ssl_comm); //printf("4 SSL_free(%X)\n",cid->ssl_comm);//debug -SSL_free(cid->ssl_comm); -SHUTDOWN(cid->sck_comm); -CLOSE(cid->sck_comm); + SSL_free(cid->ssl_comm); + SHUTDOWN(cid->sck_comm); + CLOSE(cid->sck_comm); -free(cid->read_buf); + free(cid->read_buf); -if (cid->write_buf) - free(cid->write_buf); + if (cid->write_buf) + free(cid->write_buf); -free(cid); + free(cid); } void PICA_close_acc(struct PICA_acc *a) { -SSL_CTX_free(a->ctx); -free(a); + SSL_CTX_free(a->ctx); + free(a); } void PICA_close_listener(struct PICA_listener *l) { -CLOSE(l->sck_listener); -free(l->public_addr_dns); -free(l); + CLOSE(l->sck_listener); + free(l->public_addr_dns); + free(l); } #ifdef WIN32 - const char *PICA_inet_ntop(int af, const void *src, char *dst, size_t size) +const char *PICA_inet_ntop(int af, const void *src, char *dst, size_t size) { - unsigned char *chsrc = (unsigned char*)src; - switch(af) - { - case AF_INET: - sprintf(dst, "%u.%u.%u.%u", chsrc[0], chsrc[1], chsrc[2], chsrc[3]); - break; + unsigned char *chsrc = (unsigned char*)src; + switch(af) + { + case AF_INET: + sprintf(dst, "%u.%u.%u.%u", chsrc[0], chsrc[1], chsrc[2], chsrc[3]); + break; - case AF_INET6: - sprintf(dst, "%x%02x:%x%02x:%x%02x:%x%02x:%x%02x:%x%02x:%x%02x:%x%02x", chsrc[0], chsrc[1], chsrc[2], chsrc[3], - chsrc[4], chsrc[5], chsrc[6], chsrc[7], - chsrc[8], chsrc[9], chsrc[10], chsrc[11], - chsrc[12],chsrc[13], chsrc[14], chsrc[15]); - break; + case AF_INET6: + sprintf(dst, "%x%02x:%x%02x:%x%02x:%x%02x:%x%02x:%x%02x:%x%02x:%x%02x", chsrc[0], chsrc[1], chsrc[2], chsrc[3], + chsrc[4], chsrc[5], chsrc[6], chsrc[7], + chsrc[8], chsrc[9], chsrc[10], chsrc[11], + chsrc[12], chsrc[13], chsrc[14], chsrc[15]); + break; - default: - return NULL; - } + default: + return NULL; + } - return dst; + return dst; } #endif @@ -2567,93 +2573,93 @@ free(l); int PICA_sendfile_open_read(struct PICA_c2c *chn, const char *filename_utf8, uint64_t *file_size) { #ifdef WIN32 -{ -wchar_t *wfilename = NULL; -int wlen; + { + wchar_t *wfilename = NULL; + int wlen; -wlen = MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, NULL, 0); + wlen = MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, NULL, 0); -if (wlen == 0 || wlen == 0xFFFD) - return PICA_ERRINVFILENAME; + if (wlen == 0 || wlen == 0xFFFD) + return PICA_ERRINVFILENAME; -wfilename = (wchar_t*)malloc(wlen * sizeof(wchar_t)); + wfilename = (wchar_t*)malloc(wlen * sizeof(wchar_t)); -if (!wfilename) - return PICA_ERRNOMEM; + if (!wfilename) + return PICA_ERRNOMEM; -MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, wfilename, wlen); + MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, wfilename, wlen); -chn->sendfile_stream = _wfopen(wfilename, L"rb"); + chn->sendfile_stream = _wfopen(wfilename, L"rb"); -free(wfilename); + free(wfilename); -if (chn->sendfile_stream == NULL) - return PICA_ERRFILEOPEN; + if (chn->sendfile_stream == NULL) + return PICA_ERRFILEOPEN; -if (_fseeki64(chn->sendfile_stream, 0, SEEK_END) != 0) - return PICA_ERRFILEOPEN; + if (_fseeki64(chn->sendfile_stream, 0, SEEK_END) != 0) + return PICA_ERRFILEOPEN; -*file_size = _ftelli64(chn->sendfile_stream); + *file_size = _ftelli64(chn->sendfile_stream); -if (_fseeki64(chn->sendfile_stream, 0, SEEK_SET) != 0) - return PICA_ERRFILEOPEN; -} + if (_fseeki64(chn->sendfile_stream, 0, SEEK_SET) != 0) + return PICA_ERRFILEOPEN; + } #else -chn->sendfile_stream = fopen(filename_utf8, "rb"); + chn->sendfile_stream = fopen(filename_utf8, "rb"); -if (chn->sendfile_stream == NULL) - return PICA_ERRFILEOPEN; + if (chn->sendfile_stream == NULL) + return PICA_ERRFILEOPEN; -if (fseeko(chn->sendfile_stream, 0, SEEK_END) != 0) - return PICA_ERRFILEOPEN; + if (fseeko(chn->sendfile_stream, 0, SEEK_END) != 0) + return PICA_ERRFILEOPEN; -*file_size = ftello(chn->sendfile_stream); + *file_size = ftello(chn->sendfile_stream); -if (fseeko(chn->sendfile_stream, 0, SEEK_SET) != 0) - return PICA_ERRFILEOPEN; + if (fseeko(chn->sendfile_stream, 0, SEEK_SET) != 0) + return PICA_ERRFILEOPEN; #endif -return PICA_OK; + return PICA_OK; } int PICA_recvfile_open_write(struct PICA_c2c *chn, const char *filename_utf8, unsigned int filenamesize) { ///////////// #ifdef WIN32 -{ -wchar_t *rfilename = NULL; -int rlen; + { + wchar_t *rfilename = NULL; + int rlen; -rlen = MultiByteToWideChar(CP_UTF8, 0, filename_utf8, filenamesize, NULL, 0); + rlen = MultiByteToWideChar(CP_UTF8, 0, filename_utf8, filenamesize, NULL, 0); -if (rlen == 0 || rlen == 0xFFFD) - return PICA_ERRINVFILENAME; + if (rlen == 0 || rlen == 0xFFFD) + return PICA_ERRINVFILENAME; -rlen++;//space for terminating zero character + rlen++;//space for terminating zero character -rfilename = malloc(rlen * sizeof(wchar_t)); + rfilename = malloc(rlen * sizeof(wchar_t)); -if (!rfilename) - return PICA_ERRNOMEM; + if (!rfilename) + return PICA_ERRNOMEM; -MultiByteToWideChar(CP_UTF8, 0, filename_utf8, filenamesize, rfilename, rlen); + MultiByteToWideChar(CP_UTF8, 0, filename_utf8, filenamesize, rfilename, rlen); -rfilename[rlen - 1] = L'\0'; + rfilename[rlen - 1] = L'\0'; -chn->recvfile_stream = _wfopen(rfilename, L"wb"); + chn->recvfile_stream = _wfopen(rfilename, L"wb"); -free(rfilename); + free(rfilename); -if (chn->recvfile_stream == NULL) - return PICA_ERRFILEOPEN; + if (chn->recvfile_stream == NULL) + return PICA_ERRFILEOPEN; -} + } #else -chn->recvfile_stream = fopen(filename_utf8, "wb"); + chn->recvfile_stream = fopen(filename_utf8, "wb"); -if (chn->recvfile_stream == NULL) - return PICA_ERRFILEOPEN; + if (chn->recvfile_stream == NULL) + return PICA_ERRFILEOPEN; #endif ///////////// -return PICA_OK; + return PICA_OK; } -- cgit v1.2.1 From c736cd472eac74b65b5a0ef67ba6acfdcf1b19c2 Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 13 Apr 2016 22:20:48 +0400 Subject: asynchronous processing of c2c connections, work in progress --- PICA_client.c | 210 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 163 insertions(+), 47 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 0d728f4..3d199b9 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -206,7 +206,7 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) return preverify_ok; } -static int add_chaninfo(struct PICA_c2n *ci, struct PICA_c2c **chn, const unsigned char *peer_id, int is_outgoing) +static int c2n_alloc_c2c(struct PICA_c2n *ci, struct PICA_c2c **chn, const unsigned char *peer_id, int is_outgoing) { struct PICA_c2c *chnl, *ipt; @@ -239,34 +239,16 @@ static int add_chaninfo(struct PICA_c2n *ci, struct PICA_c2c **chn, const unsign ci->chan_list_end = chnl; } + chnl->state = PICA_C2C_STATE_NEW; + return 1; } -static int establish_data_connection(struct PICA_c2c *chnl) +static int c2c_stage2_connid(struct PICA_c2c *chnl) { - char* DN_str; -//unsigned char buf[12]; - int ret, err_ret; - unsigned int tmp_uid; struct PICA_proto_msg *mp; - chnl->sck_data = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - - { - struct sockaddr_in addr = chnl->conn->srv_addr; - - addr.sin_port = htons(ntohs(addr.sin_port)); - - ret = connect( chnl->sck_data, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)); -/////////////////state_ - if (ret == SOCKET_ERROR) - { - err_ret = PICA_ERRSOCK; - goto error_ret; - } - } - - mp = c2c_writebuf_push( chnl, PICA_PROTO_CONNID, PICA_PROTO_CONNID_SIZE); + mp = c2c_writebuf_push(chnl, PICA_PROTO_CONNID, PICA_PROTO_CONNID_SIZE); if (mp) { if (chnl->outgoing) @@ -279,6 +261,8 @@ static int establish_data_connection(struct PICA_c2c *chnl) memcpy(mp->tail, chnl->peer_id, PICA_ID_SIZE);//вызвывающий memcpy(mp->tail + PICA_ID_SIZE, chnl->acc->id, PICA_ID_SIZE);//вызываемый } + + chnl->state = PICA_C2C_STATE_CONNID; } else { @@ -286,14 +270,11 @@ static int establish_data_connection(struct PICA_c2c *chnl) goto error_ret; } - do - { - err_ret = PICA_write_c2c(chnl); - if (PICA_OK != err_ret) - goto error_ret; - } - while( chnl->write_pos > 0); + return PICA_OK; +} +static int c2c_stage3_starttls(struct PICA_c2c *chnl) +{ chnl->ssl = SSL_new(chnl->acc->ctx); if (!chnl->ssl) @@ -315,22 +296,29 @@ static int establish_data_connection(struct PICA_c2c *chnl) SSL_set_verify(chnl->ssl, SSL_VERIFY_PEER, verify_callback); SSL_set_verify_depth(chnl->ssl, 1);//peer certificate and one CA - if (chnl->outgoing) ret = SSL_connect(chnl->ssl); else ret = SSL_accept(chnl->ssl); -/////////////////state_ -//printf("verify result:%i\n",(int)SSL_get_verify_result(chnl->ssl));//debug - if (ret != 1) + if (ret == 0) + return PICA_ERRSSL; + + if (ret < 0) { - //printf("ret=%i of SSL_connect or accept\n",ret);//debug - //printf("SSL_get_error says:%i\n",SSL_get_error(chnl->ssl,ret));//debug - err_ret = PICA_ERRSSL; - goto error_ret_; + ret = SSL_get_error(chnl->ssl, ret); + + if (ret != SSL_ERROR_WANT_READ && ret != SSL_ERROR_WANT_WRITE) + return PICA_ERRSSL; } + chnl->state = PICA_C2C_STATE_WAITINGTLS; + + return PICA_OK; +} + +static int c2c_verify_peer_cert(struct PICA_c2c *chnl) +{ //проверить сертификат собеседника chnl->peer_cert = SSL_get_peer_certificate(chnl->ssl); @@ -396,6 +384,89 @@ static int establish_data_connection(struct PICA_c2c *chnl) BIO_free(mem); } + return PICA_OK; +} + +static int c2c_stage4_sendc2cconnreq(struct PICA_c2c *chnl) +{ + struct PICA_proto_msg *mp; + + mp = c2c_writebuf_push(chnl, PICA_PROTO_C2CCONNREQ, PICA_PROTO_C2CCONNREQ_SIZE); + + if (!mp) + return PICA_ERRNOMEM; + + mp->tail[0] = PICA_C2CPROTO_VER_HIGH; + mp->tail[1] = PICA_C2CPROTO_VER_LOW; + + chnl->state = PICA_C2C_STATE_WAITINGREP; + + return PICA_OK; +} + +static int c2c_start(struct PICA_c2c *chnl) +{ + char* DN_str; + int ret, err_ret; + unsigned int tmp_uid; + + + chnl->sck_data = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + IOCTLSETNONBLOCKINGSOCKET(chnl->sck_data, 1); + + { + struct sockaddr_in addr = chnl->conn->srv_addr; + + addr.sin_port = htons(ntohs(addr.sin_port)); + + chnl->state = PICA_C2C_STATE_CONNECTING; + + ret = connect(chnl->sck_data, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)); + + if (ret == 0) + return c2c_stage2_connid(chnl); + +/////////////////state_ + if (ret == SOCKET_ERROR) + { +#ifndef WIN32 + if (errno == EINPROGRESS || errno == EINTR) + return PICA_OK; +#else + if (WSAGetLastError() == WSAEWOULDBLOCK) + return PICA_OK; +#endif + + err_ret = PICA_ERRSOCK; + goto error_ret; + } + } + + +/* --- move to process_c2c + do + { + err_ret = PICA_write_c2c(chnl); + if (PICA_OK != err_ret) + goto error_ret; + } + while( chnl->write_pos > 0); +*/ + +/////////////////state_ +//printf("verify result:%i\n",(int)SSL_get_verify_result(chnl->ssl));//debug + + if (ret != 1) + { + //printf("ret=%i of SSL_connect or accept\n",ret);//debug + //printf("SSL_get_error says:%i\n",SSL_get_error(chnl->ssl,ret));//debug + err_ret = PICA_ERRSSL; + goto error_ret_; + } + + + chnl->state = PICA_C2C_STATE_ACTIVE; IOCTLSETNONBLOCKINGSOCKET(chnl->sck_data, 1); @@ -413,14 +484,33 @@ error_ret: static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb, void* p) { struct PICA_c2c *cc = (struct PICA_c2n *)p; + struct PICA_proto_msg *mp; if (buf[2] == PICA_C2CPROTO_VER_HIGH && buf[3] == PICA_C2CPROTO_VER_LOW) { //send ok + mp = c2c_writebuf_push(cc, PICA_PROTO_INITRESPOK, PICA_PROTO_INITRESPOK_SIZE); + + if (!mp) + return 0; + + mp->tail[0] = 'O'; + mp->tail[1] = 'K'; + + cc->state = PICA_C2C_STATE_ACTIVE; } else { //send verdiffer, disconnect after sending + mp = c2c_writebuf_push(cc, PICA_PROTO_VERDIFFER, PICA_PROTO_VERDIFFER_SIZE); + + if (!mp) + return 0; + + mp->tail[0] = PICA_C2CPROTO_VER_HIGH; + mp->tail[1] = PICA_C2CPROTO_VER_LOW; + + cc->disconnect_on_empty_write_buf = 1; } return 1; @@ -428,6 +518,7 @@ static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb, void static unsigned int procmsg_INITRESP_c2c(unsigned char* buf, unsigned int nb, void* p) { + -- } static unsigned int procmsg_INITRESP(unsigned char* buf, unsigned int nb, void* p) @@ -474,7 +565,7 @@ static unsigned int procmsg_CONNREQINC(unsigned char* buf, unsigned int nb, void else return 0; - ret = add_chaninfo( ci, &_chnl, peer_id, 0); + ret = c2n_alloc_c2c( ci, &_chnl, peer_id, 0); if (!ret) return 0; //ERR_CHECK - кончилась память @@ -487,7 +578,7 @@ static unsigned int procmsg_CONNREQINC(unsigned char* buf, unsigned int nb, void } while( ci->write_pos > 0); - ret = establish_data_connection(_chnl); + ret = c2c_start(_chnl); if (ret != PICA_OK) return 1; @@ -562,7 +653,7 @@ static unsigned int procmsg_FOUND(unsigned char* buf, unsigned int nb, void* p) if (!rq) return 0;// ERR_CHECK -левое сообщение, такой запрос не посылался - ret = establish_data_connection(rq); + ret = c2c_start(rq); if (ret != PICA_OK) return 0; @@ -1526,7 +1617,7 @@ int PICA_new_c2c(struct PICA_c2n *ci, const unsigned char *peer_id, struct PICA_ if (!(ci && chn)) return PICA_ERRINVARG; - if (!add_chaninfo(ci, chn, peer_id, PICA_c2c_OUTGOING)) + if (!c2n_alloc_c2c(ci, chn, peer_id, PICA_c2c_OUTGOING)) return PICA_ERRNOMEM; chnl = *chn; @@ -1651,11 +1742,30 @@ static int process_c2n(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) { -//if (ic2c->state == PICA_C2C_STATE_ACTIVE) -// { -// -// } - return PICA_OK; + int ret = PICA_OK; + + switch(c2c->state) + { + case PICA_C2C_STATE_NEW: + break; + + case PICA_C2C_STATE_CONNECTING: + break; + + case PICA_C2C_STATE_CONNID: + break; + + case PICA_C2C_STATE_WAITINGTLS: + break; + + case PICA_C2C_STATE_WAITINGREP: + break; + + case PICA_C2C_STATE_ACTIVE: + break; + } + + return ret; } static int process_listener(struct PICA_listener *lst, fd_set *rfds) @@ -2018,6 +2128,9 @@ int PICA_write_c2n(struct PICA_c2n *ci) else if (PICA_C2N_STATE_CONNECTED == ci->state) ret = PICA_write_ssl( ci->ssl_comm, ci->write_buf, &ci->write_pos, &ci->write_sslbytestowrite); + if (ci->disconnect_on_empty_write_buf) + PICA_close_c2n(ci); + return ret; } @@ -2030,6 +2143,9 @@ int PICA_write_c2c(struct PICA_c2c *chn) else ret = PICA_write_ssl( chn->ssl, chn->write_buf, &chn->write_pos, &chn->write_sslbytestowrite); + if (chn->disconnect_on_empty_write_buf) + PICA_close_c2c(chn); + return ret; } -- cgit v1.2.1 From b2ce204c78131113c1a4a24f69a8d9cc4e5fe34c Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 5 May 2016 20:50:05 +0400 Subject: implemented asynchronous processing of c2c connections --- PICA_client.c | 290 ++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 192 insertions(+), 98 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 3d199b9..3b63d02 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -266,8 +266,7 @@ static int c2c_stage2_connid(struct PICA_c2c *chnl) } else { - err_ret = PICA_ERRNOMEM; - goto error_ret; + return PICA_ERRNOMEM; } return PICA_OK; @@ -275,22 +274,20 @@ static int c2c_stage2_connid(struct PICA_c2c *chnl) static int c2c_stage3_starttls(struct PICA_c2c *chnl) { + int ret; + chnl->ssl = SSL_new(chnl->acc->ctx); if (!chnl->ssl) { - //puts("SSL_new !- 0");//debug - err_ret = PICA_ERRSSL; - goto error_ret; + return PICA_ERRSSL; } ret = SSL_set_fd(chnl->ssl, chnl->sck_data); if (!ret) { - //puts("SSL_set_fd returned 0");//debug - err_ret = PICA_ERRSSL; - goto error_ret_; + return PICA_ERRSSL; } SSL_set_verify(chnl->ssl, SSL_VERIFY_PEER, verify_callback); @@ -325,8 +322,7 @@ static int c2c_verify_peer_cert(struct PICA_c2c *chnl) if (!chnl->peer_cert) { - err_ret = PICA_ERRNOPEERCERT; - goto error_ret_; + return PICA_ERRNOPEERCERT; } { @@ -334,35 +330,14 @@ static int c2c_verify_peer_cert(struct PICA_c2c *chnl) if (PICA_id_from_X509(chnl->peer_cert, temp_id) == 0) { - err_ret = PICA_ERRNOPEERCERT; - goto error_ret_; + return PICA_ERRNOPEERCERT; } if (memcmp(temp_id, chnl->peer_id, PICA_ID_SIZE) != 0) { - err_ret = PICA_ERRINVPEERCERT; - goto error_ret_; + return PICA_ERRINVPEERCERT; } } - /* - DN_str=X509_NAME_oneline(X509_get_subject_name(chnl->peer_cert), 0, 0); - - if (!DN_str) - { - //puts("no DN_str");//debug - err_ret=PICA_ERRSSL; - goto error_ret_; - } - - if (!get_id_fromsubjstr(DN_str,&tmp_uid) || tmp_uid!=chnl->peer_id) - { - err_ret=PICA_ERRINVPEERCERT; - goto error_ret_; - } - //puts(DN_str);//debug - - OPENSSL_free(DN_str);*/ - { @@ -377,8 +352,7 @@ static int c2c_verify_peer_cert(struct PICA_c2c *chnl) if (callbacks.peer_cert_verify_cb(chnl->peer_id, (const char*)cert_pem, cert_pem_nb) == 0) { BIO_free(mem); - err_ret = PICA_ERRINVPEERCERT; - goto error_ret_; + return PICA_ERRINVPEERCERT; } BIO_free(mem); @@ -425,9 +399,18 @@ static int c2c_start(struct PICA_c2c *chnl) ret = connect(chnl->sck_data, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)); if (ret == 0) - return c2c_stage2_connid(chnl); + { + ret = c2c_stage2_connid(chnl); + + if (ret != PICA_OK) + { + err_ret = ret; + goto error_ret; + } + + return PICA_OK; + } -/////////////////state_ if (ret == SOCKET_ERROR) { #ifndef WIN32 @@ -443,38 +426,8 @@ static int c2c_start(struct PICA_c2c *chnl) } } - -/* --- move to process_c2c - do - { - err_ret = PICA_write_c2c(chnl); - if (PICA_OK != err_ret) - goto error_ret; - } - while( chnl->write_pos > 0); -*/ - -/////////////////state_ -//printf("verify result:%i\n",(int)SSL_get_verify_result(chnl->ssl));//debug - - if (ret != 1) - { - //printf("ret=%i of SSL_connect or accept\n",ret);//debug - //printf("SSL_get_error says:%i\n",SSL_get_error(chnl->ssl,ret));//debug - err_ret = PICA_ERRSSL; - goto error_ret_; - } - - - - chnl->state = PICA_C2C_STATE_ACTIVE; - - IOCTLSETNONBLOCKINGSOCKET(chnl->sck_data, 1); - - return PICA_OK; -error_ret_: error_ret: callbacks.c2c_failed(chnl->peer_id); PICA_close_c2c(chnl); @@ -486,6 +439,9 @@ static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb, void struct PICA_c2c *cc = (struct PICA_c2n *)p; struct PICA_proto_msg *mp; + if (cc->state != PICA_C2C_STATE_WAITINGC2CPROTOVER) + return 0; + if (buf[2] == PICA_C2CPROTO_VER_HIGH && buf[3] == PICA_C2CPROTO_VER_LOW) { //send ok @@ -498,6 +454,8 @@ static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb, void mp->tail[1] = 'K'; cc->state = PICA_C2C_STATE_ACTIVE; + + callbacks.c2c_established_cb(cc->peer_id); } else { @@ -518,7 +476,31 @@ static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb, void static unsigned int procmsg_INITRESP_c2c(unsigned char* buf, unsigned int nb, void* p) { - -- + struct PICA_c2c *cc = (struct PICA_c2c *)p; + + if (cc->state != PICA_C2C_STATE_WAITINGREP) + return 0; + + if (!cc->outgoing) + return 0; + + switch(buf[0]) + { + case PICA_PROTO_INITRESPOK: + cc->state = PICA_C2C_STATE_ACTIVE; + callbacks.c2c_established_cb(cc->peer_id); + break; + + case PICA_PROTO_VERDIFFER: + return 0; // -- ??? + break; + + default: + return 0; + } + + + return 1; } static unsigned int procmsg_INITRESP(unsigned char* buf, unsigned int nb, void* p) @@ -583,8 +565,6 @@ static unsigned int procmsg_CONNREQINC(unsigned char* buf, unsigned int nb, void if (ret != PICA_OK) return 1; - callbacks.c2c_established_cb(_chnl->peer_id);//*nchn=_chnl; - return 1; } else @@ -658,8 +638,6 @@ static unsigned int procmsg_FOUND(unsigned char* buf, unsigned int nb, void* p) if (ret != PICA_OK) return 0; - callbacks.c2c_established_cb(rq->peer_id);//*nchn=_chnl; - return 1; } @@ -1635,6 +1613,24 @@ int PICA_new_c2c(struct PICA_c2n *ci, const unsigned char *peer_id, struct PICA_ return PICA_OK; } +static int check_async_connect_result(int sock, struct sockaddr* a, int addrlen) +{ + int ret = PICA_ERRSOCK; + +#ifndef WIN32 + int optval; + socklen_t optlen = sizeof(optval); + + if (0 == getsockopt(sock, SOL_SOCKET, SO_ERROR, &optval, &optlen) && optval == 0) +#else + if (SOCKET_ERROR == connect(sock, a, addrlen) && + WSAEISCONN == WSAGetLastError()) +#endif + ret = PICA_OK; + + return ret; +} + static int process_c2n(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) { int ret = PICA_OK; @@ -1650,29 +1646,13 @@ static int process_c2n(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) if (FD_ISSET(c2n->sck_comm, wfds)) { - ret = PICA_ERRSOCK; + ret = check_async_connect_result(c2n->sck_comm, (struct sockaddr*)&c2n->srv_addr, sizeof(c2n->srv_addr)); - //check if connect() finished successfully -#ifndef WIN32 - int optval; - socklen_t optlen = sizeof(optval); - - if (0 == getsockopt(c2n->sck_comm, SOL_SOCKET, SO_ERROR, &optval, &optlen)) - { - if (optval == 0) - { - ret = c2n_stage2_sendreq(c2n); - } - } -#else - if (SOCKET_ERROR == connect(c2n->ssl_comm, (struct sockaddr*)&c2n->srv_addr, sizeof(c2n->srv_addr)) && - WSAEISCONN == WSAGetLastError()) + if (ret == PICA_OK) { ret = c2n_stage2_sendreq(c2n); } -#endif } - break; case PICA_C2N_STATE_WAITINGREP: @@ -1750,21 +1730,112 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) break; case PICA_C2C_STATE_CONNECTING: + + if (FD_ISSET(c2c->sck_data, wfds)) + { + ret = check_async_connect_result(c2c->sck_data, (struct sockaddr*)&c2c->conn->srv_addr, sizeof(c2c->conn->srv_addr)); + + if (ret == PICA_OK) + { + ret = c2c_stage2_connid(c2c); + } + } break; case PICA_C2C_STATE_CONNID: + + if (FD_ISSET(c2c->sck_data, wfds)) + { + ret = PICA_write_c2c(c2c); + } + + if (c2c->write_pos == 0) + { + ret = c2c_stage3_starttls(c2c); + } + break; case PICA_C2C_STATE_WAITINGTLS: + + if (FD_ISSET(c2c->sck_data, wfds) || FD_ISSET(c2c->sck_data, rfds)) + { + int sslret; + + if (c2c->outgoing) + sslret = SSL_connect(c2c->ssl); + else + sslret = SSL_accept(c2c->ssl); + + if (sslret < 0) + { + sslret = SSL_get_error(c2c->ssl, sslret); + + if (sslret != SSL_ERROR_WANT_READ && sslret != SSL_ERROR_WANT_WRITE) + ret = PICA_ERRSSL; + } + else if(sslret == 0) + { + ret = PICA_ERRSSL; + } + else if (sslret == 1) + { + ret = c2c_verify_peer_cert(c2c); + + if (ret == PICA_OK && c2c->outgoing) + ret = c2c_stage4_sendc2cconnreq(c2c); + + if (ret == PICA_OK && c2c->outgoing == 0) + c2c->state = PICA_C2C_STATE_WAITINGC2CPROTOVER; + } + } break; case PICA_C2C_STATE_WAITINGREP: + case PICA_C2C_STATE_WAITINGC2CPROTOVER: + + if (FD_ISSET(c2c->sck_data, wfds)) + { + ret = PICA_write_c2c(c2c); + } + + if (ret == PICA_OK && FD_ISSET(c2c->sck_data, rfds)) + { + ret = PICA_read_c2c(c2c); + } + break; case PICA_C2C_STATE_ACTIVE: + + if (FD_ISSET(c2c->sck_data, wfds)) + { + if (c2c->write_pos > 0) + { + ret = PICA_write_c2c(c2c); + } + else if (c2c->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) + { + ret = PICA_send_file_fragment(c2c); + } + } + + if (ret == PICA_OK && FD_ISSET(c2c->sck_data, rfds)) + { + ret = PICA_read_c2c(c2c); + } + break; } + if (ret != PICA_OK) + { + if (c2c->state > PICA_C2C_STATE_NEW && c2c->state < PICA_C2C_STATE_ACTIVE) + callbacks.c2c_failed(c2c->peer_id); + else + callbacks.c2c_closed_cb(c2c->peer_id, ret); + } + return ret; } @@ -1827,7 +1898,8 @@ int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listen { fdset_add(&rfds, ic2c->sck_data, &nfds); - if (ic2c->write_pos || ic2c->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) + if (ic2c->write_pos || ic2c->state == PICA_C2C_STATE_CONNECTING || ic2c->state == PICA_C2C_STATE_WAITINGTLS + || ic2c->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) fdset_add(&wfds, ic2c->sck_data, &nfds); } @@ -2138,10 +2210,16 @@ int PICA_write_c2c(struct PICA_c2c *chn) { int ret = PICA_ERRINVARG; - if (PICA_C2C_STATE_ACTIVE != chn->state) - ret = PICA_write_socket( chn->sck_data, chn->write_buf, &chn->write_pos); + if (chn->state != PICA_C2C_STATE_ACTIVE && chn->state != PICA_C2C_STATE_CONNID && chn->state != PICA_C2C_STATE_WAITINGREP) + { + fputs("PICA_write_c2c() was called for incorrect state!\n", stderr); + exit(-1); + } + + if (PICA_C2C_STATE_CONNID == chn->state) + ret = PICA_write_socket(chn->sck_data, chn->write_buf, &chn->write_pos); else - ret = PICA_write_ssl( chn->ssl, chn->write_buf, &chn->write_pos, &chn->write_sslbytestowrite); + ret = PICA_write_ssl(chn->ssl, chn->write_buf, &chn->write_pos, &chn->write_sslbytestowrite); if (chn->disconnect_on_empty_write_buf) PICA_close_c2c(chn); @@ -2225,15 +2303,31 @@ int PICA_read_c2c(struct PICA_c2c *chn) { int ret; - if (chn->state != PICA_C2C_STATE_ACTIVE) - return PICA_OK;// ??? + if (chn->state != PICA_C2C_STATE_WAITINGREP && chn->state != PICA_C2C_STATE_WAITINGC2CPROTOVER && chn->state != PICA_C2C_STATE_ACTIVE) + { + fputs("PICA_read_c2c() was called for incorrect state!\n", stderr); + exit(-1); + } -//ret = SSL_read(chn->ssl , chn->read_buf + chn->read_pos, PICA_CHANREADBUFSIZE - chn->read_pos); ret = PICA_read_ssl(chn->ssl, chn->read_buf, &chn->read_pos, PICA_CHANREADBUFSIZE); if (ret == PICA_OK) { - if(!PICA_processdatastream(chn->read_buf, &(chn->read_pos ), chn, c2c_messages, MSGINFO_MSGSNUM(c2c_messages))) + const struct PICA_msginfo *msgs; + unsigned int nmsgs; + + if (chn->state == PICA_C2C_STATE_ACTIVE) + { + nmsgs = MSGINFO_MSGSNUM(c2c_messages); + msgs = c2c_messages; + } + else + { + nmsgs = MSGINFO_MSGSNUM(c2c_init_messages); + msgs = c2c_init_messages; + } + + if(!PICA_processdatastream(chn->read_buf, &(chn->read_pos ), chn, msgs, nmsgs)) return PICA_ERRSERV; } -- cgit v1.2.1 From e319f804ffa3a63a986fc5bb0f9a4241245d5a49 Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 5 May 2016 21:55:50 +0400 Subject: appended _cb suffix to callbacks without one --- PICA_client.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 3b63d02..a9f8de1 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -429,7 +429,7 @@ static int c2c_start(struct PICA_c2c *chnl) return PICA_OK; error_ret: - callbacks.c2c_failed(chnl->peer_id); + callbacks.c2c_failed_cb(chnl->peer_id); PICA_close_c2c(chnl); return err_ret; } @@ -903,7 +903,7 @@ static unsigned int procmsg_FILEFRAGMENT(unsigned char* buf, unsigned int nb, vo if (chan->recvfile_pos > chan->recvfile_size) //received more than file_size return 0; - callbacks.file_progress(chan->peer_id, 0, chan->recvfile_pos); + callbacks.file_progress_cb(chan->peer_id, 0, chan->recvfile_pos); if (chan->recvfile_pos == chan->recvfile_size) { @@ -911,7 +911,7 @@ static unsigned int procmsg_FILEFRAGMENT(unsigned char* buf, unsigned int nb, vo fclose(chan->recvfile_stream); chan->recvfile_stream = NULL; - callbacks.file_finished(chan->peer_id, 0); + callbacks.file_finished_cb(chan->peer_id, 0); } return 1; @@ -998,7 +998,7 @@ static unsigned int procmsg_FILECONTROL(unsigned char* buf, unsigned int nb, voi } fprintf(stderr, "procmsg_FILECONTROL calling callback\n"); - callbacks.file_control(chan->peer_id, sender_cmd, receiver_cmd); + callbacks.file_control_cb(chan->peer_id, sender_cmd, receiver_cmd); return 1; } @@ -1831,7 +1831,7 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) if (ret != PICA_OK) { if (c2c->state > PICA_C2C_STATE_NEW && c2c->state < PICA_C2C_STATE_ACTIVE) - callbacks.c2c_failed(c2c->peer_id); + callbacks.c2c_failed_cb(c2c->peer_id); else callbacks.c2c_closed_cb(c2c->peer_id, ret); } @@ -1936,7 +1936,7 @@ int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listen if (ret != PICA_OK) { - callbacks.listener_error(*ilst, ret); + callbacks.listener_error_cb(*ilst, ret); PICA_close_listener(*ilst); } @@ -2638,7 +2638,7 @@ int PICA_send_file_fragment(struct PICA_c2c *chn) chn->sendfile_pos += fragment_size; - callbacks.file_progress(chn->peer_id, chn->sendfile_pos, 0); + callbacks.file_progress_cb(chn->peer_id, chn->sendfile_pos, 0); if (chn->sendfile_pos >= chn->sendfile_size) { @@ -2646,7 +2646,7 @@ int PICA_send_file_fragment(struct PICA_c2c *chn) fclose(chn->sendfile_stream); chn->sendfile_stream = NULL; - callbacks.file_finished(chn->peer_id, 1); + callbacks.file_finished_cb(chn->peer_id, 1); } if (chn->sendfile_pos > chn->sendfile_size) -- cgit v1.2.1 From 7f25e841d052fed8ea008a1b6843f51e024a25e5 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 8 May 2016 22:10:48 +0400 Subject: fixed pointer types --- PICA_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index a9f8de1..27e2755 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -436,7 +436,7 @@ error_ret: static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb, void* p) { - struct PICA_c2c *cc = (struct PICA_c2n *)p; + struct PICA_c2c *cc = (struct PICA_c2c *)p; struct PICA_proto_msg *mp; if (cc->state != PICA_C2C_STATE_WAITINGC2CPROTOVER) -- cgit v1.2.1 From 42d945364721a184ec3379c583aed998ade61aaf Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 19 Jun 2016 17:52:34 +0400 Subject: return error from PICA_new_c2c() when c2n argument is not in connected state --- PICA_client.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 27e2755..5dc7fb0 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1595,6 +1595,9 @@ int PICA_new_c2c(struct PICA_c2n *ci, const unsigned char *peer_id, struct PICA_ if (!(ci && chn)) return PICA_ERRINVARG; + if (ci->state != PICA_C2N_STATE_CONNECTED) + return PICA_ERRINVARG; + if (!c2n_alloc_c2c(ci, chn, peer_id, PICA_c2c_OUTGOING)) return PICA_ERRNOMEM; -- cgit v1.2.1 From 9401b1a5fcf6079a00fbd852979ec07891da17fb Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 19 Jun 2016 19:57:41 +0400 Subject: bugfix - add c2c socket to write fd_set if state is connecting or higher --- PICA_client.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 5dc7fb0..7e7dce5 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1595,8 +1595,8 @@ int PICA_new_c2c(struct PICA_c2n *ci, const unsigned char *peer_id, struct PICA_ if (!(ci && chn)) return PICA_ERRINVARG; - if (ci->state != PICA_C2N_STATE_CONNECTED) - return PICA_ERRINVARG; + if (ci->state != PICA_C2N_STATE_CONNECTED) + return PICA_ERRINVARG; if (!c2n_alloc_c2c(ci, chn, peer_id, PICA_c2c_OUTGOING)) return PICA_ERRNOMEM; @@ -1897,7 +1897,7 @@ int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listen while(ic2c) { - if (ic2c->state == PICA_C2C_STATE_ACTIVE) + if (ic2c->state >= PICA_C2C_STATE_CONNECTING) { fdset_add(&rfds, ic2c->sck_data, &nfds); -- cgit v1.2.1 From 398a4e5cc4431430537dc3039f920cdf6bb4b305 Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 24 Jun 2016 22:37:56 +0400 Subject: use pseudorandom bytes in short fixed-length protocol messages instead of random in order to not drain entropy pool --- PICA_client.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 7e7dce5..fa52e63 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -720,7 +720,7 @@ static unsigned int procmsg_MSGUTF8(unsigned char* buf, unsigned int nb, void* p if (mp) { - RAND_bytes( mp->tail, 2); + RAND_pseudo_bytes( mp->tail, 2); } else return 0; @@ -745,7 +745,7 @@ unsigned int procmsg_PINGREQ(unsigned char* buf, unsigned int nb, void* p) if (mp) { - RAND_bytes(mp->tail, 2); + RAND_pseudo_bytes(mp->tail, 2); } else return 0; @@ -766,7 +766,7 @@ int PICA_deny_file(struct PICA_c2c *chan) if (mp) { - RAND_bytes(mp->tail, 2); + RAND_pseudo_bytes(mp->tail, 2); } else return PICA_ERRNOMEM; @@ -792,7 +792,7 @@ int PICA_accept_file(struct PICA_c2c *chan, char *filename, unsigned int filenam if (mp) { - RAND_bytes(mp->tail, 2); + RAND_pseudo_bytes(mp->tail, 2); } else return PICA_ERRNOMEM; @@ -1371,7 +1371,7 @@ static int c2n_stage4_nodelistrequest(struct PICA_c2n *c2n) if (mp) { - RAND_bytes(mp->tail, 2); + RAND_pseudo_bytes(mp->tail, 2); } else return PICA_ERRNOMEM; @@ -1558,7 +1558,7 @@ mp = c2n_writebuf_push( cid, PICA_PROTO_CLNODELISTREQ, PICA_PROTO_CLNODELISTREQ_ if (mp) { - RAND_bytes(mp->tail, 2); + RAND_pseudo_bytes(mp->tail, 2); } } */ -- cgit v1.2.1 From c78395ea13aead21e7041f42699fcbf3753f1832 Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 11 Aug 2016 22:28:55 +0400 Subject: added error code argument to c2n callbacks --- PICA_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index fa52e63..82d9a81 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1959,9 +1959,9 @@ int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listen if (ret != PICA_OK) { if ((*ic2n)->state == PICA_C2N_STATE_CONNECTED) - callbacks.c2n_closed_cb(*ic2n); + callbacks.c2n_closed_cb(*ic2n, ret); else - callbacks.c2n_failed_cb(*ic2n); + callbacks.c2n_failed_cb(*ic2n, ret); PICA_close_c2n(*ic2n); } -- cgit v1.2.1 From 61aa2b0243e3ba7a086b697a3bf94c2b0830955f Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 15 Aug 2016 23:12:06 +0400 Subject: removed unused variables --- PICA_client.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 82d9a81..c2eb54b 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -172,7 +172,6 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) char buf[256]; X509 *err_cert; int err, depth; - SSL *ssl; err_cert = X509_STORE_CTX_get_current_cert(ctx); err = X509_STORE_CTX_get_error(ctx); @@ -208,7 +207,7 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) static int c2n_alloc_c2c(struct PICA_c2n *ci, struct PICA_c2c **chn, const unsigned char *peer_id, int is_outgoing) { - struct PICA_c2c *chnl, *ipt; + struct PICA_c2c *chnl; chnl = *chn = (struct PICA_c2c*)calloc(sizeof(struct PICA_c2c), 1); @@ -380,9 +379,7 @@ static int c2c_stage4_sendc2cconnreq(struct PICA_c2c *chnl) static int c2c_start(struct PICA_c2c *chnl) { - char* DN_str; int ret, err_ret; - unsigned int tmp_uid; chnl->sck_data = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); -- cgit v1.2.1 From 41cd6ae48332c1ea8465e3a33db10e38103d1694 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 17 Sep 2016 15:23:53 +0400 Subject: initialize direct_c2c fields of c2c struct --- PICA_client.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index c2eb54b..e6617ee 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -239,6 +239,8 @@ static int c2n_alloc_c2c(struct PICA_c2n *ci, struct PICA_c2c **chn, const unsig } chnl->state = PICA_C2C_STATE_NEW; + chnl->directc2c_config = PICA_DIRECTC2C_CFG_DISABLED; + chnl->directc2c_state = PICA_DIRECTC2C_STATE_NEW; return 1; } -- cgit v1.2.1 From 5b9226164a3237f90823eff57c65f4fcd33f02be Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 22 Sep 2016 22:57:30 +0400 Subject: added declaration of the new function PICA_configure_directc2c() --- PICA_client.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index e6617ee..28d329d 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1120,6 +1120,12 @@ static int check_pkey_passphrase(const char *pkey_file, return PICA_OK; } + +int PICA_configure_directc2c(struct PICA_c2n *ci, PICA_directc2c_config mode, const char *public_addr, int public_port) +{ + implement me +} + // Opens socket to listen for incoming direct c2c connections bypassing nodes // // acc - pointer to opened account -- cgit v1.2.1 From 87ea77f029133fcd6b6614bfce50c59ae9988f21 Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 23 Sep 2016 03:26:50 +0400 Subject: moved direct c2c initialization into PICA_new_c2n() by adding new arguments, removed PICA_configure_directc2c() --- PICA_client.c | 96 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 47 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 28d329d..07dbab2 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -186,7 +186,7 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) if (!preverify_ok) { printf("verify error:num=%d:%s:depth=%d:%s\n", err, - X509_verify_cert_error_string(err), depth, buf); + X509_verify_cert_error_string(err), depth, buf); } @@ -239,8 +239,7 @@ static int c2n_alloc_c2c(struct PICA_c2n *ci, struct PICA_c2c **chn, const unsig } chnl->state = PICA_C2C_STATE_NEW; - chnl->directc2c_config = PICA_DIRECTC2C_CFG_DISABLED; - chnl->directc2c_state = PICA_DIRECTC2C_STATE_NEW; + chnl->directc2c_state = PICA_DIRECTC2C_STATE_NEW; return 1; } @@ -657,10 +656,10 @@ static unsigned int procmsg_CLNODELIST(unsigned char* buf, unsigned int nb, void case PICA_PROTO_NEWNODE_IPV4: callbacks.nodelist_cb( - PICA_PROTO_NEWNODE_IPV4, - buf + pos + 1, - inet_ntop(AF_INET, buf + pos + 1, ipaddr_string, INET6_ADDRSTRLEN), - ntohs(*(uint16_t*)(buf + pos + 5)) + PICA_PROTO_NEWNODE_IPV4, + buf + pos + 1, + inet_ntop(AF_INET, buf + pos + 1, ipaddr_string, INET6_ADDRSTRLEN), + ntohs(*(uint16_t*)(buf + pos + 5)) ); pos += PICA_PROTO_NODELIST_ITEM_IPV4_SIZE; @@ -669,10 +668,10 @@ static unsigned int procmsg_CLNODELIST(unsigned char* buf, unsigned int nb, void case PICA_PROTO_NEWNODE_IPV6: callbacks.nodelist_cb( - PICA_PROTO_NEWNODE_IPV6, - buf + pos + 1, - inet_ntop(AF_INET6, buf + pos + 1, ipaddr_string, INET6_ADDRSTRLEN), - ntohs(*(uint16_t*)(buf + pos + 17)) + PICA_PROTO_NEWNODE_IPV6, + buf + pos + 1, + inet_ntop(AF_INET6, buf + pos + 1, ipaddr_string, INET6_ADDRSTRLEN), + ntohs(*(uint16_t*)(buf + pos + 17)) ); pos += PICA_PROTO_NODELIST_ITEM_IPV6_SIZE; @@ -686,10 +685,10 @@ static unsigned int procmsg_CLNODELIST(unsigned char* buf, unsigned int nb, void buf[pos + 2 + buf[pos + 1]] = '\0'; // and replace it with string terminating zero callbacks.nodelist_cb( - PICA_PROTO_NEWNODE_DNS, - buf + pos + 2, - buf + pos + 2, - port + PICA_PROTO_NEWNODE_DNS, + buf + pos + 2, + buf + pos + 2, + port ); buf[pos + 2 + buf[pos + 1]] = temp_zeroswap; @@ -877,7 +876,7 @@ static unsigned int procmsg_FILEFRAGMENT(unsigned char* buf, unsigned int nb, vo *Allow incoming FILEFRAGMENTs while paused */ if (chan->recvfilestate != PICA_CHANRECVFILESTATE_RECEIVING - && chan->recvfilestate != PICA_CHANRECVFILESTATE_PAUSED) + && chan->recvfilestate != PICA_CHANRECVFILESTATE_PAUSED) return 0; if (nb - 4 != *(uint16_t*)(buf + 2)) @@ -927,7 +926,7 @@ static unsigned int procmsg_FILECONTROL(unsigned char* buf, unsigned int nb, voi fprintf(stderr, "procmsg_FILECONTROL sender_cmd = %i receiver_cmd = %i\n", sender_cmd, receiver_cmd);//debug if ((chan->sendfilestate == PICA_CHANSENDFILESTATE_IDLE || chan->sendfilestate == PICA_CHANSENDFILESTATE_SENTREQ) - && receiver_cmd != PICA_PROTO_FILECONTROL_VOID) + && receiver_cmd != PICA_PROTO_FILECONTROL_VOID) return 0; if (chan->recvfilestate == PICA_CHANRECVFILESTATE_IDLE && sender_cmd != PICA_PROTO_FILECONTROL_VOID) @@ -1088,8 +1087,8 @@ int PICA_client_init(struct PICA_client_callbacks *clcbs) } static int check_pkey_passphrase(const char *pkey_file, - int (*password_cb)(char *buf, int size, int rwflag, void *userdata), - void *userdata) + int (*password_cb)(char *buf, int size, int rwflag, void *userdata), + void *userdata) { RSA *rsa; FILE *f; @@ -1121,10 +1120,6 @@ static int check_pkey_passphrase(const char *pkey_file, } -int PICA_configure_directc2c(struct PICA_c2n *ci, PICA_directc2c_config mode, const char *public_addr, int public_port) -{ - implement me -} // Opens socket to listen for incoming direct c2c connections bypassing nodes // @@ -1214,10 +1209,10 @@ error_ret_1: //(1) } int PICA_open_acc(const char *cert_file, - const char *pkey_file, - const char *dh_param_file, - int (*password_cb)(char *buf, int size, int rwflag, void *userdata), - struct PICA_acc **acc) + const char *pkey_file, + const char *dh_param_file, + int (*password_cb)(char *buf, int size, int rwflag, void *userdata), + struct PICA_acc **acc) { int ret, ret_err; DH *dh = NULL; @@ -1404,9 +1399,9 @@ static int c2n_stage4_nodelistrequest(struct PICA_c2n *c2n) //PICA_OK - успешное завершение функции //.... -int PICA_new_c2n(const struct PICA_acc *acc, const char *nodeaddr, - unsigned int port, - struct PICA_c2n **ci) +int PICA_new_c2n(const struct PICA_acc *acc, const char *nodeaddr, unsigned int port, + enum PICA_directc2c_config direct_c2c_mode, struct PICA_listener *l, + struct PICA_c2n **ci) { int ret, ret_err; struct PICA_c2n *cid; @@ -1423,6 +1418,13 @@ int PICA_new_c2n(const struct PICA_acc *acc, const char *nodeaddr, cid->acc = acc; + cid->directc2c_config = direct_c2c_mode; + + if (direct_c2c_mode == PICA_DIRECTC2C_CFG_ALLOWINCOMING) + { + cid->directc2c_listener = l; + } + cid->read_buf = calloc(PICA_CONNREADBUFSIZE, 1);//(2) if (!cid->read_buf) { @@ -1528,14 +1530,14 @@ int PICA_new_c2n(const struct PICA_acc *acc, const char *nodeaddr, if (cid->init_resp_ok != 1) { if (cid->init_resp_ok == -1) - { - if (cid->node_ver_major > PICA_PROTO_VER_HIGH || - (cid->node_ver_major == PICA_PROTO_VER_HIGH && cid->node_ver_minor > PICA_PROTO_VER_LOW)) - ret_err = PICA_ERRPROTONEW; - else - ret_err = PICA_ERRPROTOOLD; - } - goto error_ret_4; + { + if (cid->node_ver_major > PICA_PROTO_VER_HIGH || + (cid->node_ver_major == PICA_PROTO_VER_HIGH && cid->node_ver_minor > PICA_PROTO_VER_LOW)) + ret_err = PICA_ERRPROTONEW; + else + ret_err = PICA_ERRPROTOOLD; + } + goto error_ret_4; } //printf("6\n");//debug @@ -1552,8 +1554,8 @@ if (ret!=1) //printf("SSL_accept ret=%i\n SSL_get_error=%i\n",ret,SSL_get_error(cid->ssl_comm,ret));//debug //ERR_CHECK ret_err=PICA_ERRSSL; - goto error_ret_4; - }*/ /* + goto error_ret_4; + }*/ /* cid->state = PICA_C2N_STATE_CONNECTED;//<<node_ver_major > PICA_PROTO_VER_HIGH || - (c2n->node_ver_major == PICA_PROTO_VER_HIGH && c2n->node_ver_minor > PICA_PROTO_VER_LOW)) + (c2n->node_ver_major == PICA_PROTO_VER_HIGH && c2n->node_ver_minor > PICA_PROTO_VER_LOW)) ret = PICA_ERRPROTONEW; else ret = PICA_ERRPROTOOLD; @@ -1895,7 +1897,7 @@ int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listen fdset_add(&rfds, (*ic2n)->sck_comm, &nfds); if ((*ic2n)->write_pos || (*ic2n)->state == PICA_C2N_STATE_CONNECTING - || (*ic2n)->state == PICA_C2N_STATE_WAITINGTLS) + || (*ic2n)->state == PICA_C2N_STATE_WAITINGTLS) fdset_add(&wfds, (*ic2n)->sck_comm, &nfds); ic2c = (*ic2n)->chan_list_head; @@ -2569,7 +2571,7 @@ int PICA_cancel_file(struct PICA_c2c *chan, int sending) if (sending) { if (chan->sendfilestate != PICA_CHANSENDFILESTATE_SENDING - && chan->sendfilestate != PICA_CHANSENDFILESTATE_PAUSED) + && chan->sendfilestate != PICA_CHANSENDFILESTATE_PAUSED) return PICA_ERRINVARG; fclose(chan->sendfile_stream); @@ -2581,7 +2583,7 @@ int PICA_cancel_file(struct PICA_c2c *chan, int sending) else { if (chan->recvfilestate != PICA_CHANRECVFILESTATE_RECEIVING - && chan->recvfilestate != PICA_CHANRECVFILESTATE_PAUSED) + && chan->recvfilestate != PICA_CHANRECVFILESTATE_PAUSED) return PICA_ERRINVARG; fclose(chan->recvfile_stream); @@ -2774,9 +2776,9 @@ const char *PICA_inet_ntop(int af, const void *src, char *dst, size_t size) case AF_INET6: sprintf(dst, "%x%02x:%x%02x:%x%02x:%x%02x:%x%02x:%x%02x:%x%02x:%x%02x", chsrc[0], chsrc[1], chsrc[2], chsrc[3], - chsrc[4], chsrc[5], chsrc[6], chsrc[7], - chsrc[8], chsrc[9], chsrc[10], chsrc[11], - chsrc[12], chsrc[13], chsrc[14], chsrc[15]); + chsrc[4], chsrc[5], chsrc[6], chsrc[7], + chsrc[8], chsrc[9], chsrc[10], chsrc[11], + chsrc[12], chsrc[13], chsrc[14], chsrc[15]); break; default: -- cgit v1.2.1 From d73440f78e5cd662b8938fe730ba9c4176b91e85 Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 23 Sep 2016 18:20:22 +0400 Subject: renamed to PICA_DIRECTC2C_STATE_INACTIVE --- PICA_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 07dbab2..679c8d2 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -239,7 +239,7 @@ static int c2n_alloc_c2c(struct PICA_c2n *ci, struct PICA_c2c **chn, const unsig } chnl->state = PICA_C2C_STATE_NEW; - chnl->directc2c_state = PICA_DIRECTC2C_STATE_NEW; + chnl->directc2c_state = PICA_DIRECTC2C_STATE_INACTIVE; return 1; } -- cgit v1.2.1 From 637eb86df1027d0e47bd7a801f7f9c5324bb6b01 Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 23 Sep 2016 19:01:43 +0400 Subject: added timeout handling to process_c2c(); removed unused obsolete functions --- PICA_client.c | 137 +++------------------------------------------------------- 1 file changed, 5 insertions(+), 132 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 679c8d2..54047e6 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1838,6 +1838,11 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) break; } + if (c2c->state != PICA_C2C_STATE_ACTIVE && (time(0) - c2c->timestamp) > PICA_C2C_ACTIVATE_TIMEOUT) + { + ret = PICA_ERRTIMEDOUT; + } + if (ret != PICA_OK) { if (c2c->state > PICA_C2C_STATE_NEW && c2c->state < PICA_C2C_STATE_ACTIVE) @@ -2001,138 +2006,6 @@ int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listen return PICA_OK; } -int PICA_read(struct PICA_c2n *ci, int timeout) -{ - fd_set fds; - struct timeval tv = {0, 1000}; - struct PICA_c2c *ipt, *kill_ptr = 0; - int ret, nfds; - -//puts("PICA_read<<");//debug - - tv.tv_usec = timeout; - - FD_ZERO(&fds); - - nfds = ci->sck_comm; - FD_SET(ci->sck_comm, &fds); - - ipt = ci->chan_list_head; - - while(ipt) - { - if (ipt->state == PICA_C2C_STATE_ACTIVE) - { - FD_SET(ipt->sck_data, &fds); - - if (ipt->sck_data > nfds) - nfds = ipt->sck_data; - } - - if (ipt->state != PICA_C2C_STATE_ACTIVE && (time(0) - ipt->timestamp) > PICA_CHAN_ACTIVATE_TIMEOUT) - { - kill_ptr = ipt; - } - - ipt = ipt->next; - - if (kill_ptr) - { - PICA_close_c2c(kill_ptr); - kill_ptr = 0; - } - } - -//#warning "make sockets non-blocking!!!!" - - ret = select(nfds + 1, &fds, 0, 0, &tv); - - if (ret > 0) - { - - if (FD_ISSET(ci->sck_comm, &fds)) - { - ret = PICA_read_c2n(ci); - if (ret != PICA_OK) - return ret; - } - - ipt = ci->chan_list_head; - while(ipt) - { - if (ipt->state == PICA_C2C_STATE_ACTIVE && FD_ISSET(ipt->sck_data, &fds)) - { - if (PICA_OK != (ret = PICA_read_c2c(ipt)) ) - { - puts("PICA_read_c2c() failed");//debug - callbacks.c2c_closed_cb(ipt->peer_id, ret); - kill_ptr = ipt; - } - - } - - ipt = ipt->next; - - if (kill_ptr) - { - PICA_close_c2c(kill_ptr); - kill_ptr = 0; - } - } - - } -//puts("PICA_read>>");//debug - - return PICA_OK; -} - -int PICA_write(struct PICA_c2n *ci) -{ - struct PICA_c2c *ipt, *kill_ptr = 0; - int ret = PICA_OK; - -//puts("PICA_write>>");//debug - - if (ci->write_pos) - ret = PICA_write_c2n(ci); - - if (PICA_OK != ret) - return ret; - - ipt = ci->chan_list_head; - - while(ipt) - { - if (ipt->write_pos) - { - if (PICA_OK != (ret = PICA_write_c2c(ipt))) - { - fprintf(stderr, "PICA_write_c2c() failed, ret = %i\n", ret); //debug - callbacks.c2c_closed_cb(ipt->peer_id, ret); - kill_ptr = ipt; - } - } - else if (ipt->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) - { - if (PICA_OK != (ret = PICA_send_file_fragment(ipt))) - { - callbacks.c2c_closed_cb(ipt->peer_id, ret); - kill_ptr = ipt; - } - } - ipt = ipt->next; - - if (kill_ptr) - { - PICA_close_c2c(kill_ptr); - kill_ptr = 0; - } - } - -//puts("PICA_write<<");//debug - return PICA_OK; -} - int PICA_write_socket(SOCKET s, unsigned char *buf, unsigned int *ppos) { int ret; -- cgit v1.2.1 From 1341e2afca0dd1de1f2d28f51f445d09ec6ddc07 Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 23 Sep 2016 19:06:00 +0400 Subject: renamed macros, use PICA_C2C_INCOMING instead of 0 magic number --- PICA_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 54047e6..d50c034 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -545,7 +545,7 @@ static unsigned int procmsg_CONNREQINC(unsigned char* buf, unsigned int nb, void else return 0; - ret = c2n_alloc_c2c( ci, &_chnl, peer_id, 0); + ret = c2n_alloc_c2c( ci, &_chnl, peer_id, PICA_C2C_INCOMING); if (!ret) return 0; //ERR_CHECK - кончилась память @@ -1605,7 +1605,7 @@ int PICA_new_c2c(struct PICA_c2n *ci, const unsigned char *peer_id, struct PICA_ if (ci->state != PICA_C2N_STATE_CONNECTED) return PICA_ERRINVARG; - if (!c2n_alloc_c2c(ci, chn, peer_id, PICA_c2c_OUTGOING)) + if (!c2n_alloc_c2c(ci, chn, peer_id, PICA_C2C_OUTGOING)) return PICA_ERRNOMEM; chnl = *chn; -- cgit v1.2.1 From 7a394a9baf4863ab2c5b8f60eefb98688ee96a7c Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 23 Sep 2016 19:14:10 +0400 Subject: function declarations --- PICA_client.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index d50c034..1f026a7 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -52,6 +52,15 @@ static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb, void static struct PICA_proto_msg* c2n_writebuf_push(struct PICA_c2n *ci, unsigned int msgid, unsigned int size); static struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned int msgid, unsigned int size); +static int PICA_write_c2n(struct PICA_c2n *ci); +static int PICA_write_c2c(struct PICA_c2c *chn); +static int PICA_write_ssl(SSL *ssl, unsigned char *buf, unsigned int *ppos, unsigned int *btw); +static int PICA_write_socket(SOCKET s, unsigned char *buf, unsigned int *ppos); +static int PICA_read_c2n(struct PICA_c2n *ci); +static int PICA_read_c2c(struct PICA_c2c *chn); +static int PICA_read_ssl(SSL *ssl, unsigned char *buf, unsigned int *ppos, unsigned int size); +static int PICA_read_socket(SOCKET s, unsigned char *buf, unsigned int *ppos, unsigned int size); + #define MSGINFO_MSGSNUM(arr) (sizeof(arr)/sizeof(struct PICA_msginfo)) const struct PICA_msginfo c2n_messages[] = { @@ -2071,9 +2080,6 @@ int PICA_write_ssl(SSL *ssl, unsigned char *buf, unsigned int *ppos, unsigned in return PICA_OK; } -//int PICA_read_socket() -//int PICA_read_ssl() - int PICA_write_c2n(struct PICA_c2n *ci) { int ret = PICA_ERRINVARG; -- cgit v1.2.1 From 076f242539c57cc4f3ccec388c0f09403aa43227 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 25 Sep 2016 00:59:40 +0400 Subject: direct c2c packet handlers --- PICA_client.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 1f026a7..63ed3eb 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -47,7 +47,10 @@ static unsigned int procmsg_DENIEDFILE(unsigned char*, unsigned int, void*); static unsigned int procmsg_FILEFRAGMENT(unsigned char*, unsigned int, void*); static unsigned int procmsg_FILECONTROL(unsigned char*, unsigned int, void*); static unsigned int procmsg_INITRESP_c2c(unsigned char*, unsigned int, void*); -static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb, void* p); +static unsigned int procmsg_C2CCONNREQ(unsigned char*, unsigned int, void*); +static unsigned int procmsg_PICA_PROTO_C2CDIRECT_ADDRLIST(unsigned char*, unsigned int, void*); +static unsigned int procmsg_PICA_PROTO_C2CDIRECT_FAILED(unsigned char*, unsigned int, void*); + static struct PICA_proto_msg* c2n_writebuf_push(struct PICA_c2n *ci, unsigned int msgid, unsigned int size); static struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned int msgid, unsigned int size); @@ -79,7 +82,9 @@ const struct PICA_msginfo c2c_messages[] = {PICA_PROTO_ACCEPTEDFILE, PICA_MSG_FIXED_SIZE, PICA_PROTO_ACCEPTEDFILE_SIZE, procmsg_ACCEPTEDFILE}, {PICA_PROTO_DENIEDFILE, PICA_MSG_FIXED_SIZE, PICA_PROTO_DENIEDFILE_SIZE, procmsg_DENIEDFILE}, {PICA_PROTO_FILEFRAGMENT, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_FILEFRAGMENT}, - {PICA_PROTO_FILECONTROL, PICA_MSG_FIXED_SIZE, PICA_PROTO_FILECONTROL_SIZE, procmsg_FILECONTROL} + {PICA_PROTO_FILECONTROL, PICA_MSG_FIXED_SIZE, PICA_PROTO_FILECONTROL_SIZE, procmsg_FILECONTROL}, + {PICA_PROTO_C2CDIRECT_ADDRLIST, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_PICA_PROTO_C2CDIRECT_ADDRLIST}, + {PICA_PROTO_C2CDIRECT_FAILED, PICA_MSG_FIXED_SIZE, PICA_PROTO_C2CDIRECT_FAILED_SIZE, procmsg_PICA_PROTO_C2CDIRECT_FAILED} }; struct PICA_msginfo c2n_init_messages[] = @@ -510,6 +515,16 @@ static unsigned int procmsg_INITRESP_c2c(unsigned char* buf, unsigned int nb, vo return 1; } +static unsigned int procmsg_PICA_PROTO_C2CDIRECT_ADDRLIST(unsigned char* buf, unsigned int nb, void* p) +{ + -- +} + +static unsigned int procmsg_PICA_PROTO_C2CDIRECT_FAILED(unsigned char* buf, unsigned int nb, void* p) +{ + -- +} + static unsigned int procmsg_INITRESP(unsigned char* buf, unsigned int nb, void* p) { struct PICA_c2n *ci = (struct PICA_c2n *)p; @@ -1865,6 +1880,19 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) static int process_listener(struct PICA_listener *lst, fd_set *rfds) { + if (FD_ISSET(lst->sck_listener, rfds)) + { + SOCKET s; + struct sockaddr_in addr; + int addrsize = sizeof(struct sockaddr_in); + + s = accept(lst->sck_listener, (struct sockaddr*)&addr, &addrsize); + + if (s >= 0) + { + + } + } return PICA_OK; } -- cgit v1.2.1 From fbe88d4debb49d03a3a97e450ca2a69bf91b058b Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 25 Sep 2016 01:14:51 +0400 Subject: linked listener processing to c2n struct --- PICA_client.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 63ed3eb..b1ff144 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1904,13 +1904,12 @@ static void fdset_add(fd_set *fds, int fd, int *max) *max = fd; } -int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listeners, int timeout) +int PICA_event_loop(struct PICA_c2n **connections, int timeout) { fd_set rfds, wfds; struct timeval tv; int ret, nfds = 0; struct PICA_c2n **ic2n; - struct PICA_listener **ilst; //puts("PICA_event_loop");//debug @@ -1920,14 +1919,6 @@ int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listen FD_ZERO(&rfds); FD_ZERO(&wfds); - ilst = listeners; - - while(ilst && *ilst) - { - fdset_add(&rfds, (*ilst)->sck_listener, &nfds); - ilst++; - } - ic2n = connections; while(ic2n && *ic2n) @@ -1942,6 +1933,8 @@ int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listen || (*ic2n)->state == PICA_C2N_STATE_WAITINGTLS) fdset_add(&wfds, (*ic2n)->sck_comm, &nfds); + fdset_add(&rfds, (*ic2n)->directc2c_listener->sck_listener, &nfds); + ic2c = (*ic2n)->chan_list_head; while(ic2c) @@ -1980,21 +1973,6 @@ int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listen //processing listeners, c2n and c2c connections - ilst = listeners; - - while(ilst && *ilst) - { - ret = process_listener(*ilst, &rfds); - - if (ret != PICA_OK) - { - callbacks.listener_error_cb(*ilst, ret); - PICA_close_listener(*ilst); - } - - ilst++; - } - ic2n = connections; while(ic2n && *ic2n) @@ -2018,6 +1996,16 @@ int PICA_event_loop(struct PICA_c2n **connections, struct PICA_listener **listen { struct PICA_c2c *kill_ptr = 0; + //processing listener associated with current c2n + ret = process_listener((*ic2n)->directc2c_listener, &rfds); + + if (ret != PICA_OK) + { + callbacks.listener_error_cb((*ic2n)->directc2c_listener, ret); + PICA_close_listener((*ic2n)->directc2c_listener); + } + + ic2c = (*ic2n)->chan_list_head; //processing c2c connections associated with current c2n -- cgit v1.2.1 From 9008d31c8c4401051e50d26f1743501688ffc9bc Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 28 Sep 2016 02:30:50 +0400 Subject: listener connection struct and code accepting listener connections --- PICA_client.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index b1ff144..ce7f66e 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1196,6 +1196,8 @@ int PICA_new_listener(const struct PICA_acc *acc, const char *public_addr, int p flag = 1; setsockopt(lst->sck_listener, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag)); + IOCTLSETNONBLOCKINGSOCKET(lst->sck_listener, 1); + memset(&s, 0, sizeof(s)); s.sin_family = AF_INET; s.sin_addr.s_addr = INADDR_ANY; @@ -1878,6 +1880,46 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) return ret; } +static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) +{ + struct PICA_listener_conn *nc; + int ret; + + nc = calloc(1, sizeof(struct PICA_listener_conn)); + + nc->sck = s; + nc->ssl = SSL_new(lst->acc->ctx); + + SSL_set_fd(nc->ssl, nc->sck); + ret = SSL_accept(nc->ssl); + + if (ret == 0) + { + free(nc); + return; + } + + if (ret < 0) + { + ret = SSL_get_error(nc->ssl, ret); + + if (ret != SSL_ERROR_WANT_READ && ret != SSL_ERROR_WANT_WRITE) + { + free(nc); + return; + } + } + + nc->next = lst->accepted_connections; + + lst->accepted_connections = nc; +} + +static int process_listener_conn() +{ + -- +} + static int process_listener(struct PICA_listener *lst, fd_set *rfds) { if (FD_ISSET(lst->sck_listener, rfds)) @@ -1890,9 +1932,10 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds) if (s >= 0) { - + listener_add_connection(lst, s); } } + return PICA_OK; } -- cgit v1.2.1 From 9164d6c7266f2ea66459d1971128ca6071e6a4a2 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 17 Oct 2016 19:22:45 +0400 Subject: processing connections accepted by listener, work in progress --- PICA_client.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 4 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index ce7f66e..4f218c3 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1915,13 +1915,45 @@ static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) lst->accepted_connections = nc; } -static int process_listener_conn() +static int process_listener_conn(struct PICA_listener_conn *conn, fd_set *rfds, fd_set *wfds) { - -- + if (conn->peer_cert == NULL) + { + if (FD_ISSET(conn->sck, rfds) || FD_ISSET(conn->sck, wfds)) + { + int ret; + ret = SSL_accept(conn->ssl); + + if (ret == 1) + { + conn->peer_cert = SSL_get_peer_certificate(conn->ssl); + + if (!conn->peer_cert) + return PICA_ERRSSL; + + return PICA_OK; + } + + if (ret == 0) + return PICA_ERRSSL; + + if (ret < 0) + { + ret = SSL_get_error(conn->ssl, ret); + + if (ret != SSL_ERROR_WANT_READ && ret != SSL_ERROR_WANT_WRITE) + return PICA_ERRSSL; + } + } + } + + return PICA_OK; } -static int process_listener(struct PICA_listener *lst, fd_set *rfds) +static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfds) { + struct PICA_listener_conn *conn; + if (FD_ISSET(lst->sck_listener, rfds)) { SOCKET s; @@ -1936,6 +1968,17 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds) } } + conn = lst->accepted_connections; + + while(conn) + { + if (process_listener_conn(conn, rfds, wfds) != PICA_OK) + { + --- close listener conn + } + conn = conn->next; + } + return PICA_OK; } @@ -2040,7 +2083,7 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) struct PICA_c2c *kill_ptr = 0; //processing listener associated with current c2n - ret = process_listener((*ic2n)->directc2c_listener, &rfds); + ret = process_listener((*ic2n)->directc2c_listener, &rfds, &wfds); if (ret != PICA_OK) { @@ -2700,6 +2743,8 @@ void PICA_close_listener(struct PICA_listener *l) CLOSE(l->sck_listener); free(l->public_addr_dns); free(l); + + -- close accepted connections } #ifdef WIN32 -- cgit v1.2.1 From abbfa4ccdcfc8633e5b30064f66af40b6b17cbd6 Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 21 Oct 2016 16:35:50 +0400 Subject: implemented closing listener connections --- PICA_client.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 4f218c3..85469c9 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1972,11 +1972,18 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfd while(conn) { + struct PICA_listener_conn *kill_ptr = NULL; + if (process_listener_conn(conn, rfds, wfds) != PICA_OK) { - --- close listener conn + kill_ptr = conn; } conn = conn->next; + + if (kill_ptr) + { + listener_close_conn(kill_ptr); + } } return PICA_OK; @@ -2738,13 +2745,29 @@ void PICA_close_acc(struct PICA_acc *a) free(a); } +void listener_close_conn(struct PICA_listener_conn *c) +{ + SSL_free(c->ssl); + SHUTDOWN(c->sck); + CLOSE(c->sck); + + X509_free(c->peer_cert); + free(c); +} + void PICA_close_listener(struct PICA_listener *l) { CLOSE(l->sck_listener); free(l->public_addr_dns); - free(l); - -- close accepted connections + while(l->accepted_connections) + { + struct PICA_listener_conn *c = l->accepted_connections; + l->accepted_connections = c->next; + listener_close_conn(c); + } + + free(l); } #ifdef WIN32 -- cgit v1.2.1 From 4e4ec4e69c201565e3c1e87a520650ab490924c0 Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 26 Oct 2016 19:57:36 +0400 Subject: add listener connections' sockets to fd_set-s in event loop --- PICA_client.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 85469c9..9374f35 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -2017,6 +2017,7 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) while(ic2n && *ic2n) { struct PICA_c2c *ic2c; + struct PICA_listener_conn *ilstcon; //printf("event_loop: adding c2n %p\n", *ic2n);//debug @@ -2028,6 +2029,15 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) fdset_add(&rfds, (*ic2n)->directc2c_listener->sck_listener, &nfds); + ilstcon = (*ic2n)->directc2c_listener->accepted_connections; + + while (ilstcon) + { + fdset_add(&rfds, ilstcon->sck, &nfds); + fdset_add(&wfds, ilstcon->sck, &nfds); + ilstcon = ilstcon->next; + } + ic2c = (*ic2n)->chan_list_head; while(ic2c) -- cgit v1.2.1 From 78967c09eb9e911572b23a4160ce4b06f83da95e Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 24 Nov 2016 21:17:17 +0400 Subject: implemented sending direct c2c address list (single address only yet, to be improved) --- PICA_client.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 9374f35..416e469 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -32,6 +32,7 @@ static int PICA_send_file_fragment(struct PICA_c2c *chn); static int PICA_sendfile_open_read(struct PICA_c2c *chn, const char *filename_utf8, uint64_t *file_size); static int PICA_recvfile_open_write(struct PICA_c2c *chn, const char *filename_utf8, unsigned int filenamesize); static int PICA_send_filecontrol(struct PICA_c2c *chan, int senderctl, int receiverctl); +static int PICA_send_directc2caddrlist(struct PICA_c2c *chn); static unsigned int procmsg_INITRESP(unsigned char*, unsigned int, void*); static unsigned int procmsg_CONNREQINC(unsigned char*, unsigned int, void*); @@ -468,6 +469,9 @@ static unsigned int procmsg_C2CCONNREQ(unsigned char* buf, unsigned int nb, void cc->state = PICA_C2C_STATE_ACTIVE; callbacks.c2c_established_cb(cc->peer_id); + + if (cc->conn->directc2c_config == PICA_DIRECTC2C_CFG_ALLOWINCOMING) + PICA_send_directc2caddrlist(cc); } else { @@ -501,6 +505,10 @@ static unsigned int procmsg_INITRESP_c2c(unsigned char* buf, unsigned int nb, vo case PICA_PROTO_INITRESPOK: cc->state = PICA_C2C_STATE_ACTIVE; callbacks.c2c_established_cb(cc->peer_id); + + if (cc->conn->directc2c_config == PICA_DIRECTC2C_CFG_ALLOWINCOMING) + PICA_send_directc2caddrlist(cc); + break; case PICA_PROTO_VERDIFFER: @@ -2436,6 +2444,27 @@ struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned int msgi return mp; } +int PICA_send_directc2caddrlist(struct PICA_c2c *chn) +{ + if (chn->conn->directc2c_config == PICA_DIRECTC2C_CFG_ALLOWINCOMING && chn->conn->directc2c_listener) + { + struct PICA_proto_msg *mp; + //TODO send all possible interface addresses, not one + unsigned int len = PICA_PROTO_C2CDIRECT_IPV4_SIZE; + + if ((mp = c2c_writebuf_push(chn, PICA_PROTO_C2CDIRECT_ADDRLIST, len + 4))) + { + *((uint16_t*)mp->tail) = len; + *((uint8_t*)mp->tail + 2) = PICA_PROTO_C2CDIRECT_IPV4; + *((uint8_t*)mp->tail + 3) = PICA_PROTO_C2CDIRECT_IPV4; + *((uint32_t*)mp->tail + 4) = chn->conn->directc2c_listener->public_addr_ipv4; + *((uint16_t*)mp->tail + 8) = htons(chn->conn->directc2c_listener->public_port); + } + } + + return PICA_OK; +} + int PICA_send_msg(struct PICA_c2c *chn, char *buf, unsigned int len) { struct PICA_proto_msg *mp; -- cgit v1.2.1 From eac0690e821f90793a5d55263ecd71a5ad34adcd Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 24 Nov 2016 21:53:22 +0400 Subject: check if listener is not NULL before processing --- PICA_client.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 416e469..3567a91 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -2035,15 +2035,18 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) || (*ic2n)->state == PICA_C2N_STATE_WAITINGTLS) fdset_add(&wfds, (*ic2n)->sck_comm, &nfds); - fdset_add(&rfds, (*ic2n)->directc2c_listener->sck_listener, &nfds); + if ((*ic2n)->directc2c_listener) + { + fdset_add(&rfds, (*ic2n)->directc2c_listener->sck_listener, &nfds); - ilstcon = (*ic2n)->directc2c_listener->accepted_connections; + ilstcon = (*ic2n)->directc2c_listener->accepted_connections; - while (ilstcon) - { - fdset_add(&rfds, ilstcon->sck, &nfds); - fdset_add(&wfds, ilstcon->sck, &nfds); - ilstcon = ilstcon->next; + while (ilstcon) + { + fdset_add(&rfds, ilstcon->sck, &nfds); + fdset_add(&wfds, ilstcon->sck, &nfds); + ilstcon = ilstcon->next; + } } ic2c = (*ic2n)->chan_list_head; @@ -2108,12 +2111,15 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) struct PICA_c2c *kill_ptr = 0; //processing listener associated with current c2n - ret = process_listener((*ic2n)->directc2c_listener, &rfds, &wfds); - - if (ret != PICA_OK) + if ((*ic2n)->directc2c_listener) { - callbacks.listener_error_cb((*ic2n)->directc2c_listener, ret); - PICA_close_listener((*ic2n)->directc2c_listener); + ret = process_listener((*ic2n)->directc2c_listener, &rfds, &wfds); + + if (ret != PICA_OK) + { + callbacks.listener_error_cb((*ic2n)->directc2c_listener, ret); + PICA_close_listener((*ic2n)->directc2c_listener); + } } -- cgit v1.2.1 From 3dbb6dab7b05aa37369ce2d5d3e593e63a158250 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 26 Nov 2016 02:59:19 +0400 Subject: renamed PICA_listener_conn to PICA_c2c_direct, use same struct for incoming and outgoing direct connections --- PICA_client.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 3567a91..57f9877 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1890,10 +1890,10 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) { - struct PICA_listener_conn *nc; + struct PICA_c2c_direct *nc; int ret; - nc = calloc(1, sizeof(struct PICA_listener_conn)); + nc = calloc(1, sizeof(struct PICA_c2c_direct)); nc->sck = s; nc->ssl = SSL_new(lst->acc->ctx); @@ -1923,7 +1923,7 @@ static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) lst->accepted_connections = nc; } -static int process_listener_conn(struct PICA_listener_conn *conn, fd_set *rfds, fd_set *wfds) +static int process_listener_conn(struct PICA_c2c_direct *conn, fd_set *rfds, fd_set *wfds) { if (conn->peer_cert == NULL) { @@ -1960,7 +1960,7 @@ static int process_listener_conn(struct PICA_listener_conn *conn, fd_set *rfds, static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfds) { - struct PICA_listener_conn *conn; + struct PICA_c2c_direct *conn; if (FD_ISSET(lst->sck_listener, rfds)) { @@ -1980,7 +1980,7 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfd while(conn) { - struct PICA_listener_conn *kill_ptr = NULL; + struct PICA_c2c_direct *kill_ptr = NULL; if (process_listener_conn(conn, rfds, wfds) != PICA_OK) { @@ -2025,7 +2025,7 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) while(ic2n && *ic2n) { struct PICA_c2c *ic2c; - struct PICA_listener_conn *ilstcon; + struct PICA_c2c_direct *ilstcon; //printf("event_loop: adding c2n %p\n", *ic2n);//debug @@ -2790,7 +2790,7 @@ void PICA_close_acc(struct PICA_acc *a) free(a); } -void listener_close_conn(struct PICA_listener_conn *c) +void listener_close_conn(struct PICA_c2c_direct *c) { SSL_free(c->ssl); SHUTDOWN(c->sck); @@ -2807,7 +2807,7 @@ void PICA_close_listener(struct PICA_listener *l) while(l->accepted_connections) { - struct PICA_listener_conn *c = l->accepted_connections; + struct PICA_c2c_direct *c = l->accepted_connections; l->accepted_connections = c->next; listener_close_conn(c); } -- cgit v1.2.1 From 158d5b71b968d17c7b50d77302ee73466cb099fe Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 4 Dec 2016 22:46:43 +0400 Subject: implementing outgoing direct c2c connections and direct c2c-related packets exchange, work in progress --- PICA_client.c | 153 ++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 112 insertions(+), 41 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 57f9877..a54e31f 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -56,6 +56,9 @@ static unsigned int procmsg_PICA_PROTO_C2CDIRECT_FAILED(unsigned char*, unsigned static struct PICA_proto_msg* c2n_writebuf_push(struct PICA_c2n *ci, unsigned int msgid, unsigned int size); static struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned int msgid, unsigned int size); +static int process_first_async_connect_result(int connect_ret); +static int check_async_connect_result(int sock, struct sockaddr* a, int addrlen); + static int PICA_write_c2n(struct PICA_c2n *ci); static int PICA_write_c2c(struct PICA_c2c *chn); static int PICA_write_ssl(SSL *ssl, unsigned char *buf, unsigned int *ppos, unsigned int *btw); @@ -424,19 +427,8 @@ static int c2c_start(struct PICA_c2c *chnl) return PICA_OK; } - if (ret == SOCKET_ERROR) - { -#ifndef WIN32 - if (errno == EINPROGRESS || errno == EINTR) - return PICA_OK; -#else - if (WSAGetLastError() == WSAEWOULDBLOCK) - return PICA_OK; -#endif - - err_ret = PICA_ERRSOCK; + if ((err_ret = process_first_async_connect_result(ret)) != PICA_OK) goto error_ret; - } } return PICA_OK; @@ -523,9 +515,74 @@ static unsigned int procmsg_INITRESP_c2c(unsigned char* buf, unsigned int nb, vo return 1; } +static int c2c_direct_connect_next(struct PICA_c2c_direct *dc2c, struct PICA_c2c *c2c) +{ + int ret; + + if (dc2c->addrpos == 0) + dc2c->addrpos += 2; + + if (dc2c->addrpos >= *(uint16_t*)dc2c->addrlist) + return PICA_OK; + + switch(*dc2c->addrpos) + { + case PICA_PROTO_C2CDIRECT_IPV4: + dc2c->sck = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + memset(&dc2c->addr, 0, sizeof(dc2c->addr)); + dc2c->addr.sin_family = AF_INET; + dc2c->addr.sin_addr.s_addr = *((in_addr_t*)(dc2c->addrpos + 1)); + dc2c->addr.sin_port = *((uint16_t*)(dc2c->addrpos + 5)); + + ret = connect(dc2c->sck, (struct sockaddr*)&dc2c->addr, sizeof(dc2c->addr)); + + if (ret) + ... + + dc2c->addrpos += PICA_PROTO_C2CDIRECT_ADDRLIST_ITEM_IPV4_SIZE; + break; + + case PICA_PROTO_C2CDIRECT_IPV6: + break; + + } + + +} + static unsigned int procmsg_PICA_PROTO_C2CDIRECT_ADDRLIST(unsigned char* buf, unsigned int nb, void* p) { - -- + struct PICA_c2c *cc = (struct PICA_c2c *)p; + + if (cc->conn->directc2c_config != PICA_DIRECTC2C_CFG_DISABLED) + { + if (cc->directc2c_state != PICA_DIRECTC2C_STATE_INACTIVE) + return 1; + + cc->directc2c_state = PICA_DIRECTC2C_STATE_CONNECTING; + cc->direct = calloc(1, sizeof(struct PICA_c2c_direct)); + + if (!cc->direct) + return 1; + + cc->direct->is_outgoing = PICA_DIRECTC2C_OUTGOING; + cc->direct->sck = -1; + cc->direct->addrlist = malloc(nb - 2 + 1); + + if (!cc->direct->addrlist) + return 1; + + memcpy(cc->direct->addrlist, buf + 2, nb - 2);// copy size and address list + cc->direct->addrlist[nb - 2] = 0; + cc->direct->addrpos = 0; + + + ret = c2c_direct_connect_next(cc->direct, cc); + ... + } + + return 1; } static unsigned int procmsg_PICA_PROTO_C2CDIRECT_FAILED(unsigned char* buf, unsigned int nb, void* p) @@ -1526,20 +1583,8 @@ int PICA_new_c2n(const struct PICA_acc *acc, const char *nodeaddr, unsigned int if (ret == 0) return c2n_stage2_sendreq(cid); - if (ret == SOCKET_ERROR) - { -#ifndef WIN32 - if (errno == EINPROGRESS || errno == EINTR) - return PICA_OK; -#else - if (WSAGetLastError() == WSAEWOULDBLOCK) - return PICA_OK; -#endif - - ret_err = PICA_ERRSOCK; + if ((ret_err = process_first_async_connect_result(ret)) != PICA_OK) goto error_ret_4; - } - /* @@ -1657,6 +1702,24 @@ int PICA_new_c2c(struct PICA_c2n *ci, const unsigned char *peer_id, struct PICA_ return PICA_OK; } +static int process_first_async_connect_result(int connect_ret) +{ + if (connect_ret == SOCKET_ERROR) + { +#ifndef WIN32 + if (errno == EINPROGRESS || errno == EINTR) + return PICA_OK; +#else + if (WSAGetLastError() == WSAEWOULDBLOCK) + return PICA_OK; +#endif + + return PICA_ERRSOCK; + } + + return PICA_OK; +} + static int check_async_connect_result(int sock, struct sockaddr* a, int addrlen) { int ret = PICA_ERRSOCK; @@ -1895,6 +1958,7 @@ static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) nc = calloc(1, sizeof(struct PICA_c2c_direct)); + nc->is_outgoing = PICA_DIRECTC2C_INCOMING; nc->sck = s; nc->ssl = SSL_new(lst->acc->ctx); @@ -1990,7 +2054,7 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfd if (kill_ptr) { - listener_close_conn(kill_ptr); + PICA_close_directc2c(kill_ptr); } } @@ -2456,15 +2520,14 @@ int PICA_send_directc2caddrlist(struct PICA_c2c *chn) { struct PICA_proto_msg *mp; //TODO send all possible interface addresses, not one - unsigned int len = PICA_PROTO_C2CDIRECT_IPV4_SIZE; + unsigned int len = PICA_PROTO_C2CDIRECT_ADDRLIST_ITEM_IPV4_SIZE; if ((mp = c2c_writebuf_push(chn, PICA_PROTO_C2CDIRECT_ADDRLIST, len + 4))) { *((uint16_t*)mp->tail) = len; *((uint8_t*)mp->tail + 2) = PICA_PROTO_C2CDIRECT_IPV4; - *((uint8_t*)mp->tail + 3) = PICA_PROTO_C2CDIRECT_IPV4; - *((uint32_t*)mp->tail + 4) = chn->conn->directc2c_listener->public_addr_ipv4; - *((uint16_t*)mp->tail + 8) = htons(chn->conn->directc2c_listener->public_port); + *((uint32_t*)mp->tail + 3) = chn->conn->directc2c_listener->public_addr_ipv4; + *((uint16_t*)mp->tail + 7) = htons(chn->conn->directc2c_listener->public_port); } } @@ -2697,6 +2760,20 @@ int PICA_send_file_fragment(struct PICA_c2c *chn) return PICA_OK; } +void PICA_close_directc2c(struct PICA_c2c_direct *d) +{ + if (d->peer_cert) + X509_free(d->peer_cert); + + if (d->addrlist) + free(d->addrlist); + + SSL_free(c->ssl); + SHUTDOWN(c->sck); + CLOSE(c->sck); + + free(d); +} void PICA_close_c2c(struct PICA_c2c *chn) { @@ -2759,6 +2836,9 @@ void PICA_close_c2c(struct PICA_c2c *chn) //puts("PICA_close_c2c_chkp5");//debug CLOSE(chn->sck_data); //puts("PICA_close_c2c_chkp6");//debug + if (chn->direct) + PICA_close_directc2c(chn->direct); + free(chn); //puts("PICA_close_c2c_chkp7");//debug } @@ -2790,15 +2870,6 @@ void PICA_close_acc(struct PICA_acc *a) free(a); } -void listener_close_conn(struct PICA_c2c_direct *c) -{ - SSL_free(c->ssl); - SHUTDOWN(c->sck); - CLOSE(c->sck); - - X509_free(c->peer_cert); - free(c); -} void PICA_close_listener(struct PICA_listener *l) { @@ -2809,7 +2880,7 @@ void PICA_close_listener(struct PICA_listener *l) { struct PICA_c2c_direct *c = l->accepted_connections; l->accepted_connections = c->next; - listener_close_conn(c); + PICA_close_directc2c(c); } free(l); -- cgit v1.2.1 From 8b79ad64f29e845badf95f5f3b625a09505d3f02 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 5 Dec 2016 15:52:12 +0400 Subject: renamed C2CDIRECT to DIRECTC2C everywhere --- PICA_client.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index a54e31f..3a67827 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -49,8 +49,8 @@ static unsigned int procmsg_FILEFRAGMENT(unsigned char*, unsigned int, void*); static unsigned int procmsg_FILECONTROL(unsigned char*, unsigned int, void*); static unsigned int procmsg_INITRESP_c2c(unsigned char*, unsigned int, void*); static unsigned int procmsg_C2CCONNREQ(unsigned char*, unsigned int, void*); -static unsigned int procmsg_PICA_PROTO_C2CDIRECT_ADDRLIST(unsigned char*, unsigned int, void*); -static unsigned int procmsg_PICA_PROTO_C2CDIRECT_FAILED(unsigned char*, unsigned int, void*); +static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char*, unsigned int, void*); +static unsigned int procmsg_PICA_PROTO_DIRECTC2C_FAILED(unsigned char*, unsigned int, void*); static struct PICA_proto_msg* c2n_writebuf_push(struct PICA_c2n *ci, unsigned int msgid, unsigned int size); @@ -87,8 +87,8 @@ const struct PICA_msginfo c2c_messages[] = {PICA_PROTO_DENIEDFILE, PICA_MSG_FIXED_SIZE, PICA_PROTO_DENIEDFILE_SIZE, procmsg_DENIEDFILE}, {PICA_PROTO_FILEFRAGMENT, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_FILEFRAGMENT}, {PICA_PROTO_FILECONTROL, PICA_MSG_FIXED_SIZE, PICA_PROTO_FILECONTROL_SIZE, procmsg_FILECONTROL}, - {PICA_PROTO_C2CDIRECT_ADDRLIST, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_PICA_PROTO_C2CDIRECT_ADDRLIST}, - {PICA_PROTO_C2CDIRECT_FAILED, PICA_MSG_FIXED_SIZE, PICA_PROTO_C2CDIRECT_FAILED_SIZE, procmsg_PICA_PROTO_C2CDIRECT_FAILED} + {PICA_PROTO_DIRECTC2C_ADDRLIST, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST}, + {PICA_PROTO_DIRECTC2C_FAILED, PICA_MSG_FIXED_SIZE, PICA_PROTO_DIRECTC2C_FAILED_SIZE, procmsg_PICA_PROTO_DIRECTC2C_FAILED} }; struct PICA_msginfo c2n_init_messages[] = @@ -515,7 +515,7 @@ static unsigned int procmsg_INITRESP_c2c(unsigned char* buf, unsigned int nb, vo return 1; } -static int c2c_direct_connect_next(struct PICA_c2c_direct *dc2c, struct PICA_c2c *c2c) +static int directc2c_connect_next(struct PICA_directc2c *dc2c, struct PICA_c2c *c2c) { int ret; @@ -527,7 +527,7 @@ static int c2c_direct_connect_next(struct PICA_c2c_direct *dc2c, struct PICA_c2c switch(*dc2c->addrpos) { - case PICA_PROTO_C2CDIRECT_IPV4: + case PICA_PROTO_DIRECTC2C_IPV4: dc2c->sck = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); memset(&dc2c->addr, 0, sizeof(dc2c->addr)); @@ -540,10 +540,10 @@ static int c2c_direct_connect_next(struct PICA_c2c_direct *dc2c, struct PICA_c2c if (ret) ... - dc2c->addrpos += PICA_PROTO_C2CDIRECT_ADDRLIST_ITEM_IPV4_SIZE; + dc2c->addrpos += PICA_PROTO_DIRECTC2C_ADDRLIST_ITEM_IPV4_SIZE; break; - case PICA_PROTO_C2CDIRECT_IPV6: + case PICA_PROTO_DIRECTC2C_IPV6: break; } @@ -551,7 +551,7 @@ static int c2c_direct_connect_next(struct PICA_c2c_direct *dc2c, struct PICA_c2c } -static unsigned int procmsg_PICA_PROTO_C2CDIRECT_ADDRLIST(unsigned char* buf, unsigned int nb, void* p) +static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, unsigned int nb, void* p) { struct PICA_c2c *cc = (struct PICA_c2c *)p; @@ -561,7 +561,7 @@ static unsigned int procmsg_PICA_PROTO_C2CDIRECT_ADDRLIST(unsigned char* buf, un return 1; cc->directc2c_state = PICA_DIRECTC2C_STATE_CONNECTING; - cc->direct = calloc(1, sizeof(struct PICA_c2c_direct)); + cc->direct = calloc(1, sizeof(struct PICA_directc2c)); if (!cc->direct) return 1; @@ -578,14 +578,14 @@ static unsigned int procmsg_PICA_PROTO_C2CDIRECT_ADDRLIST(unsigned char* buf, un cc->direct->addrpos = 0; - ret = c2c_direct_connect_next(cc->direct, cc); + ret = directc2c_connect_next(cc->direct, cc); ... } return 1; } -static unsigned int procmsg_PICA_PROTO_C2CDIRECT_FAILED(unsigned char* buf, unsigned int nb, void* p) +static unsigned int procmsg_PICA_PROTO_DIRECTC2C_FAILED(unsigned char* buf, unsigned int nb, void* p) { -- } @@ -1953,10 +1953,10 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) { - struct PICA_c2c_direct *nc; + struct PICA_directc2c *nc; int ret; - nc = calloc(1, sizeof(struct PICA_c2c_direct)); + nc = calloc(1, sizeof(struct PICA_directc2c)); nc->is_outgoing = PICA_DIRECTC2C_INCOMING; nc->sck = s; @@ -1987,7 +1987,7 @@ static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) lst->accepted_connections = nc; } -static int process_listener_conn(struct PICA_c2c_direct *conn, fd_set *rfds, fd_set *wfds) +static int process_listener_conn(struct PICA_directc2c *conn, fd_set *rfds, fd_set *wfds) { if (conn->peer_cert == NULL) { @@ -2024,7 +2024,7 @@ static int process_listener_conn(struct PICA_c2c_direct *conn, fd_set *rfds, fd_ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfds) { - struct PICA_c2c_direct *conn; + struct PICA_directc2c *conn; if (FD_ISSET(lst->sck_listener, rfds)) { @@ -2044,7 +2044,7 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfd while(conn) { - struct PICA_c2c_direct *kill_ptr = NULL; + struct PICA_directc2c *kill_ptr = NULL; if (process_listener_conn(conn, rfds, wfds) != PICA_OK) { @@ -2089,7 +2089,7 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) while(ic2n && *ic2n) { struct PICA_c2c *ic2c; - struct PICA_c2c_direct *ilstcon; + struct PICA_directc2c *ilstcon; //printf("event_loop: adding c2n %p\n", *ic2n);//debug @@ -2520,12 +2520,12 @@ int PICA_send_directc2caddrlist(struct PICA_c2c *chn) { struct PICA_proto_msg *mp; //TODO send all possible interface addresses, not one - unsigned int len = PICA_PROTO_C2CDIRECT_ADDRLIST_ITEM_IPV4_SIZE; + unsigned int len = PICA_PROTO_DIRECTC2C_ADDRLIST_ITEM_IPV4_SIZE; - if ((mp = c2c_writebuf_push(chn, PICA_PROTO_C2CDIRECT_ADDRLIST, len + 4))) + if ((mp = c2c_writebuf_push(chn, PICA_PROTO_DIRECTC2C_ADDRLIST, len + 4))) { *((uint16_t*)mp->tail) = len; - *((uint8_t*)mp->tail + 2) = PICA_PROTO_C2CDIRECT_IPV4; + *((uint8_t*)mp->tail + 2) = PICA_PROTO_DIRECTC2C_IPV4; *((uint32_t*)mp->tail + 3) = chn->conn->directc2c_listener->public_addr_ipv4; *((uint16_t*)mp->tail + 7) = htons(chn->conn->directc2c_listener->public_port); } @@ -2760,7 +2760,7 @@ int PICA_send_file_fragment(struct PICA_c2c *chn) return PICA_OK; } -void PICA_close_directc2c(struct PICA_c2c_direct *d) +void PICA_close_directc2c(struct PICA_directc2c *d) { if (d->peer_cert) X509_free(d->peer_cert); @@ -2878,7 +2878,7 @@ void PICA_close_listener(struct PICA_listener *l) while(l->accepted_connections) { - struct PICA_c2c_direct *c = l->accepted_connections; + struct PICA_directc2c *c = l->accepted_connections; l->accepted_connections = c->next; PICA_close_directc2c(c); } -- cgit v1.2.1 From 660205d022eb3b9a48b613035ad4fcd0663c98ff Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 5 Dec 2016 19:42:33 +0400 Subject: implemented starting direct c2c connection --- PICA_client.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 3a67827..aa0ad95 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -523,7 +523,7 @@ static int directc2c_connect_next(struct PICA_directc2c *dc2c, struct PICA_c2c * dc2c->addrpos += 2; if (dc2c->addrpos >= *(uint16_t*)dc2c->addrlist) - return PICA_OK; + return PICA_ERRNOTFOUND; switch(*dc2c->addrpos) { @@ -535,10 +535,14 @@ static int directc2c_connect_next(struct PICA_directc2c *dc2c, struct PICA_c2c * dc2c->addr.sin_addr.s_addr = *((in_addr_t*)(dc2c->addrpos + 1)); dc2c->addr.sin_port = *((uint16_t*)(dc2c->addrpos + 5)); + dc2c->state = PICA_DIRECTC2C_CONNSTATE_CONNECTING; + ret = connect(dc2c->sck, (struct sockaddr*)&dc2c->addr, sizeof(dc2c->addr)); - if (ret) - ... + ret = process_first_async_connect_result(ret); + + if (ret != PICA_OK) + dc2c->state = PICA_DIRECTC2C_CONNSTATE_FAILED; dc2c->addrpos += PICA_PROTO_DIRECTC2C_ADDRLIST_ITEM_IPV4_SIZE; break; @@ -548,12 +552,13 @@ static int directc2c_connect_next(struct PICA_directc2c *dc2c, struct PICA_c2c * } - + return PICA_OK; } static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, unsigned int nb, void* p) { struct PICA_c2c *cc = (struct PICA_c2c *)p; + int ret; if (cc->conn->directc2c_config != PICA_DIRECTC2C_CFG_DISABLED) { @@ -567,6 +572,7 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, un return 1; cc->direct->is_outgoing = PICA_DIRECTC2C_OUTGOING; + cc->direct->state = PICA_DIRECTC2C_CONNSTATE_NEW; cc->direct->sck = -1; cc->direct->addrlist = malloc(nb - 2 + 1); @@ -579,7 +585,11 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, un ret = directc2c_connect_next(cc->direct, cc); - ... + + if (ret == PICA_ERRNOTFOUND) + { + cc->directc2c_state = PICA_DIRECTC2C_STATE_INACTIVE; + } } return 1; -- cgit v1.2.1 From eb132677fd65a57582cb920caed15dd9fa310888 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 5 Dec 2016 19:46:59 +0400 Subject: new direct c2c state that is set when outgoing connections to all direct addresses provided by peer have failed --- PICA_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index aa0ad95..af6718e 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -588,7 +588,7 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, un if (ret == PICA_ERRNOTFOUND) { - cc->directc2c_state = PICA_DIRECTC2C_STATE_INACTIVE; + cc->directc2c_state = PICA_DIRECTC2C_STATE_FAILEDTOCONNECT; } } -- cgit v1.2.1 From 13fee28314bbe2c6e2e59dd6451838ed1a944d6f Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 24 Dec 2016 02:52:15 +0400 Subject: setting and handling PICA_DIRECTC2C_STATE_WAITINGINCOMING state --- PICA_client.c | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index af6718e..6c86a35 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -562,10 +562,18 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, un if (cc->conn->directc2c_config != PICA_DIRECTC2C_CFG_DISABLED) { - if (cc->directc2c_state != PICA_DIRECTC2C_STATE_INACTIVE) - return 1; + //if (cc->directc2c_state != PICA_DIRECTC2C_STATE_INACTIVE) + // return 1; + + //if (cc->outgoing == PICA_C2C_OUTGOING) + // cc->directc2c_state = PICA_DIRECTC2C_STATE_CONNECTING; + //else if (cc->outgoing == PICA_C2C_INCOMING) + // cc->directc2c_state = PICA_DIRECTC2C_STATE_WAITINGINCOMING; + //else + // return 0; + if (cc->directc2c_state != PICA_DIRECTC2C_STATE_WAITINGINCOMING) + cc->directc2c_state = PICA_DIRECTC2C_STATE_CONNECTING; - cc->directc2c_state = PICA_DIRECTC2C_STATE_CONNECTING; cc->direct = calloc(1, sizeof(struct PICA_directc2c)); if (!cc->direct) @@ -583,6 +591,8 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, un cc->direct->addrlist[nb - 2] = 0; cc->direct->addrpos = 0; + if (cc->directc2c_state == PICA_DIRECTC2C_STATE_WAITINGINCOMING) + return 1;//connect later, if no incoming connection is accepted and DIRECTC2C_FAILED is received ret = directc2c_connect_next(cc->direct, cc); @@ -597,7 +607,23 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, un static unsigned int procmsg_PICA_PROTO_DIRECTC2C_FAILED(unsigned char* buf, unsigned int nb, void* p) { - -- + struct PICA_c2c *cc = (struct PICA_c2c *)p; + int ret; + + if (cc->directc2c_state != PICA_DIRECTC2C_STATE_WAITINGINCOMING) + return 0; + + if (cc->conn->directc2c_config == PICA_DIRECTC2C_CFG_DISABLED) + return 0; + + ret = directc2c_connect_next(cc->direct, cc); + + if (ret == PICA_ERRNOTFOUND) + { + cc->directc2c_state = PICA_DIRECTC2C_STATE_FAILEDTOCONNECT; + } + + return 1; } static unsigned int procmsg_INITRESP(unsigned char* buf, unsigned int nb, void* p) @@ -2538,6 +2564,9 @@ int PICA_send_directc2caddrlist(struct PICA_c2c *chn) *((uint8_t*)mp->tail + 2) = PICA_PROTO_DIRECTC2C_IPV4; *((uint32_t*)mp->tail + 3) = chn->conn->directc2c_listener->public_addr_ipv4; *((uint16_t*)mp->tail + 7) = htons(chn->conn->directc2c_listener->public_port); + + if (chn->outgoing == PICA_C2C_INCOMING) + chn->directc2c_state = PICA_DIRECTC2C_STATE_WAITINGINCOMING; } } @@ -2778,9 +2807,9 @@ void PICA_close_directc2c(struct PICA_directc2c *d) if (d->addrlist) free(d->addrlist); - SSL_free(c->ssl); - SHUTDOWN(c->sck); - CLOSE(c->sck); + SSL_free(d->ssl); + SHUTDOWN(d->sck); + CLOSE(d->sck); free(d); } -- cgit v1.2.1 From a991eb82decec01d25ac39805ee60e4fea196ef7 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 24 Dec 2016 22:56:45 +0400 Subject: implementing process_directc2c(), work in progress --- PICA_client.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 6c86a35..fe82195 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1987,6 +1987,45 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) return ret; } +static struct PICA_c2c * find_matching_c2c(struct PICA_c2n *c2n, struct PICA_directc2c *d) +{ + -- +} + +static void process_directc2c(struct PICA_c2n *c2n) +{ + //process accepted connections + if (c2n->directc2c_listener) + { + PICA_directc2c *d; + PICA_c2c *c2c; + + d = c2n->directc2c_listener->accepted_connections; + + while(d) + { + if (d->state == PICA_DIRECTC2C_STATE_ACTIVE) + { + if ((c2c = find_matching_c2c(c2n, d))) + { + if (c2c->direct) + PICA_close_directc2c(c2c->direct); + + c2c->direct = d; + ... + } + else + { + -- + } + } + d = d->next; + } + } + //process outgoing connections + -- +} + static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) { struct PICA_directc2c *nc; @@ -1997,6 +2036,7 @@ static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) nc->is_outgoing = PICA_DIRECTC2C_INCOMING; nc->sck = s; nc->ssl = SSL_new(lst->acc->ctx); + nc->state = PICA_DIRECTC2C_CONNSTATE_NEW; SSL_set_fd(nc->ssl, nc->sck); ret = SSL_accept(nc->ssl); @@ -2018,6 +2058,8 @@ static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) } } + nc->state = PICA_DIRECTC2C_CONNSTATE_WAITINGTLS; + nc->next = lst->accepted_connections; lst->accepted_connections = nc; @@ -2039,6 +2081,7 @@ static int process_listener_conn(struct PICA_directc2c *conn, fd_set *rfds, fd_s if (!conn->peer_cert) return PICA_ERRSSL; + conn->state = PICA_DIRECTC2C_CONNSTATE_ACTIVE; return PICA_OK; } @@ -2241,6 +2284,12 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) kill_ptr = 0; } } + + //processing direct c2c connections associated with current c2n + if ((*ic2n)->directc2c_config != PICA_DIRECTC2C_CFG_DISABLED) + { + process_directc2c(*ic2n); + } } ic2n++; } -- cgit v1.2.1 From a4762905029bd8710ced13fcee80763bafba6ff3 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 26 Dec 2016 18:41:55 +0400 Subject: implemented find_matching_c2c() --- PICA_client.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index fe82195..709e817 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1989,7 +1989,27 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) static struct PICA_c2c * find_matching_c2c(struct PICA_c2n *c2n, struct PICA_directc2c *d) { - -- + struct PICA_c2c *c2c; + unsigned char idbuf[PICA_ID_SIZE]; + + if (!PICA_id_from_X509(d->peer_cert, idbuf)) + return NULL; + + c2c = c2n->chan_list_head; + + while(c2c) + { + if (c2c->directc2c_state == PICA_DIRECTC2C_STATE_WAITINGINCOMING) + { + if (memcmp(idbuf, c2c->peer_id, PICA_ID_SIZE) == 0) + { + return c2c; + } + } + c2c = c2c->next; + } + + return NULL; } static void process_directc2c(struct PICA_c2n *c2n) @@ -1997,8 +2017,8 @@ static void process_directc2c(struct PICA_c2n *c2n) //process accepted connections if (c2n->directc2c_listener) { - PICA_directc2c *d; - PICA_c2c *c2c; + struct PICA_directc2c *d; + struct PICA_c2c *c2c; d = c2n->directc2c_listener->accepted_connections; -- cgit v1.2.1 From f13e465ecbc0ea245a3945e562d8a74f5a1f3493 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 26 Dec 2016 20:21:20 +0400 Subject: set verification callback for incoming directc2c TLS connection --- PICA_client.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 709e817..73984df 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -2059,6 +2059,10 @@ static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) nc->state = PICA_DIRECTC2C_CONNSTATE_NEW; SSL_set_fd(nc->ssl, nc->sck); + + SSL_set_verify(nc->ssl, SSL_VERIFY_PEER, verify_callback); + SSL_set_verify_depth(nc->ssl, 1); + ret = SSL_accept(nc->ssl); if (ret == 0) -- cgit v1.2.1 From 8c43c0fda7bbc41316021668084f47bedb66c26c Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 28 Dec 2016 21:56:26 +0400 Subject: declared functions for sending DIRECTC2C_FAILED and DIRECTC2C_SWITCH messages, also for processing received DIRECTC2C_SWITCH --- PICA_client.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 73984df..179778a 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -33,6 +33,8 @@ static int PICA_sendfile_open_read(struct PICA_c2c *chn, const char *filename_ut static int PICA_recvfile_open_write(struct PICA_c2c *chn, const char *filename_utf8, unsigned int filenamesize); static int PICA_send_filecontrol(struct PICA_c2c *chan, int senderctl, int receiverctl); static int PICA_send_directc2caddrlist(struct PICA_c2c *chn); +static int PICA_send_directc2cfailed(struct PICA_c2c *chn); +static int PICA_send_directc2c_switch(struct PICA_c2c *chn); static unsigned int procmsg_INITRESP(unsigned char*, unsigned int, void*); static unsigned int procmsg_CONNREQINC(unsigned char*, unsigned int, void*); @@ -51,6 +53,7 @@ static unsigned int procmsg_INITRESP_c2c(unsigned char*, unsigned int, void*); static unsigned int procmsg_C2CCONNREQ(unsigned char*, unsigned int, void*); static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char*, unsigned int, void*); static unsigned int procmsg_PICA_PROTO_DIRECTC2C_FAILED(unsigned char*, unsigned int, void*); +static unsigned int procmsg_PICA_PROTO_DIRECTC2C_SWITCH(unsigned char*, unsigned int, void*); static struct PICA_proto_msg* c2n_writebuf_push(struct PICA_c2n *ci, unsigned int msgid, unsigned int size); @@ -88,7 +91,8 @@ const struct PICA_msginfo c2c_messages[] = {PICA_PROTO_FILEFRAGMENT, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_FILEFRAGMENT}, {PICA_PROTO_FILECONTROL, PICA_MSG_FIXED_SIZE, PICA_PROTO_FILECONTROL_SIZE, procmsg_FILECONTROL}, {PICA_PROTO_DIRECTC2C_ADDRLIST, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST}, - {PICA_PROTO_DIRECTC2C_FAILED, PICA_MSG_FIXED_SIZE, PICA_PROTO_DIRECTC2C_FAILED_SIZE, procmsg_PICA_PROTO_DIRECTC2C_FAILED} + {PICA_PROTO_DIRECTC2C_FAILED, PICA_MSG_FIXED_SIZE, PICA_PROTO_DIRECTC2C_FAILED_SIZE, procmsg_PICA_PROTO_DIRECTC2C_FAILED}, + {PICA_PROTO_DIRECTC2C_SWITCH, PICA_MSG_FIXED_SIZE, PICA_PROTO_DIRECTC2C_SWITCH_SIZE, procmsg_PICA_PROTO_DIRECTC2C_SWITCH} }; struct PICA_msginfo c2n_init_messages[] = @@ -2024,7 +2028,7 @@ static void process_directc2c(struct PICA_c2n *c2n) while(d) { - if (d->state == PICA_DIRECTC2C_STATE_ACTIVE) + if (d->state == PICA_DIRECTC2C_CONNSTATE_ACTIVE) { if ((c2c = find_matching_c2c(c2n, d))) { @@ -2036,6 +2040,7 @@ static void process_directc2c(struct PICA_c2n *c2n) } else { + //close and remove from listener's list -- } } @@ -2646,6 +2651,16 @@ int PICA_send_directc2caddrlist(struct PICA_c2c *chn) return PICA_OK; } +static int PICA_send_directc2cfailed(struct PICA_c2c *chn) +{ + -- +} + +static int PICA_send_directc2c_switch(struct PICA_c2c *chn) +{ + -- +} + int PICA_send_msg(struct PICA_c2c *chn, char *buf, unsigned int len) { struct PICA_proto_msg *mp; -- cgit v1.2.1 From ebda46444033ac87dccc1fae725a101c8fef38e4 Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 29 Dec 2016 21:11:08 +0400 Subject: implemented PICA_send_directc2cfailed() and PICA_send_directc2c_switch() --- PICA_client.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 179778a..ef4e2dc 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -2653,12 +2653,30 @@ int PICA_send_directc2caddrlist(struct PICA_c2c *chn) static int PICA_send_directc2cfailed(struct PICA_c2c *chn) { - -- + struct PICA_proto_msg *mp; + + if ((mp = c2c_writebuf_push(chn, PICA_PROTO_DIRECTC2C_FAILED, PICA_PROTO_DIRECTC2C_FAILED_SIZE))) + { + RAND_pseudo_bytes(mp->tail, 2); + } + else + return PICA_ERRNOMEM; + + return PICA_OK; } static int PICA_send_directc2c_switch(struct PICA_c2c *chn) { - -- + struct PICA_proto_msg *mp; + + if ((mp = c2c_writebuf_push(chn, PICA_PROTO_DIRECTC2C_SWITCH, PICA_PROTO_DIRECTC2C_SWITCH_SIZE))) + { + RAND_pseudo_bytes(mp->tail, 2); + } + else + return PICA_ERRNOMEM; + + return PICA_OK; } int PICA_send_msg(struct PICA_c2c *chn, char *buf, unsigned int len) -- cgit v1.2.1 From ec015653e2b9396390ef4e273d3273931d908ebc Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 9 Jan 2017 21:42:00 +0400 Subject: processing directc2c, work in progress --- PICA_client.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 145 insertions(+), 7 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index ef4e2dc..0a59af8 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -627,9 +627,16 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_FAILED(unsigned char* buf, unsi cc->directc2c_state = PICA_DIRECTC2C_STATE_FAILEDTOCONNECT; } + cc->directc2c_state = PICA_DIRECTC2C_STATE_CONNECTING; + return 1; } +unsigned int procmsg_PICA_PROTO_DIRECTC2C_SWITCH(unsigned char*, unsigned int, void*) +{ + --- +} + static unsigned int procmsg_INITRESP(unsigned char* buf, unsigned int nb, void* p) { struct PICA_c2n *ci = (struct PICA_c2n *)p; @@ -1514,6 +1521,34 @@ static int c2n_stage4_nodelistrequest(struct PICA_c2n *c2n) return PICA_OK; } +static int directc2c_stage2_starttls(struct PICA_directc2c *d, struct PICA_c2c *c2c) +{ + int ret; + + d->ssl = SSL_new(c2c->acc->ctx); + + SSL_set_fd(d->ssl, d->sck); + SSL_set_verify(d->ssl, SSL_VERIFY_PEER, verify_callback); + SSL_set_verify_depth(d->ssl, 1); + + ret = SSL_connect(d->ssl); + + if (ret == 0) + return PICA_ERRSSL; + + if (ret < 0) + { + ret = SSL_get_error(d->ssl, ret); + + if (ret != SSL_ERROR_WANT_READ && ret != SSL_ERROR_WANT_WRITE) + return PICA_ERRSSL; + } + + d->state = PICA_DIRECTC2C_CONNSTATE_WAITINGTLS; + + return PICA_OK; +} + /*адрес сервера, сертификат клиента и закрытый ключ*/ //Осуществляет подключение к серверу по указанному адресу. @@ -2016,15 +2051,19 @@ static struct PICA_c2c * find_matching_c2c(struct PICA_c2n *c2n, struct PICA_dir return NULL; } -static void process_directc2c(struct PICA_c2n *c2n) +static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) { + struct PICA_directc2c *d; + struct PICA_c2c *c2c; + int ret; + //process accepted connections if (c2n->directc2c_listener) { - struct PICA_directc2c *d; - struct PICA_c2c *c2c; + struct PICA_directc2c **pdprev; d = c2n->directc2c_listener->accepted_connections; + pdprev = &c2n->directc2c_listener->accepted_connections; while(d) { @@ -2036,19 +2075,104 @@ static void process_directc2c(struct PICA_c2n *c2n) PICA_close_directc2c(c2c->direct); c2c->direct = d; - ... + + ret = PICA_send_directc2c_switch(c2c);---//??? who should send first? + + if (ret != PICA_OK) + { + PICA_close_directc2c(d); + c2c->directc2c_state = PICA_DIRECTC2C_STATE_INACTIVE; + } + else + { + c2c->directc2c_state = PICA_DIRECTC2C_STATE_ACTIVE; + } + + //remove from listener's list + *pdprev = d->next; + d->next = 0; } else { //close and remove from listener's list - -- + *pdprev = d->next; + PICA_close_directc2c(d); } } + pdprev = &d->next; d = d->next; + -- killptr? } } //process outgoing connections - -- + c2c = c2n->chan_list_head; + while(c2c) + { + if (c2c->directc2c_state == PICA_DIRECTC2C_STATE_FAILEDTOCONNECT) + { + if (c2c->outgoing == PICA_C2C_OUTGOING && c2c->conn->directc2c_config == PICA_DIRECTC2C_CFG_ALLOWINCOMING) + { + ret = PICA_send_directc2cfailed(c2c); + + if (ret == PICA_OK) + c2c->directc2c_state = PICA_DIRECTC2C_STATE_WAITINGINCOMING; + else + c2c->directc2c_state = PICA_DIRECTC2C_STATE_INACTIVE; + } + else + c2c->directc2c_state = PICA_DIRECTC2C_STATE_INACTIVE; + } + + if (c2c->directc2c_state == PICA_DIRECTC2C_STATE_CONNECTING) + { + d = c2c->direct; + ret = PICA_OK; + + switch(d->state) + { + case PICA_DIRECTC2C_CONNSTATE_CONNECTING: + + if (FD_ISSET(d->sck, wfds)) + { + ret = check_async_connect_result(d->sck, (struct sockaddr*)&d->addr, sizeof(d->addr)); + + if (ret == PICA_OK) + { + ret = directc2c_stage2_starttls(d, c2c); + } + else + { + ret = directc2c_connect_next(d, c2c); + + if (ret == PICA_ERRNOTFOUND) + c2c->directc2c_state = PICA_DIRECTC2C_STATE_FAILEDTOCONNECT; + } + } + break; + + case PICA_DIRECTC2C_CONNSTATE_WAITINGTLS: + break; + + case PICA_DIRECTC2C_CONNSTATE_FAILED: + break; + + case PICA_DIRECTC2C_CONNSTATE_ACTIVE: + break; + -- + } + + if (ret != PICA_OK) + { + PICA_close_directc2c(d); + c2c->direct = 0; + + if (c2c->directc2c_state != PICA_DIRECTC2C_STATE_FAILEDTOCONNECT) + c2c->directc2c_state = PICA_DIRECTC2C_STATE_INACTIVE;//fallback to c2c through node? + } + + } + c2c = c2c->next; + } } static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) @@ -2133,6 +2257,7 @@ static int process_listener_conn(struct PICA_directc2c *conn, fd_set *rfds, fd_s static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfds) { struct PICA_directc2c *conn; + struct PICA_directc2c **pprevconn; if (FD_ISSET(lst->sck_listener, rfds)) { @@ -2149,6 +2274,7 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfd } conn = lst->accepted_connections; + pprevconn = &lst->accepted_connections; while(conn) { @@ -2158,10 +2284,13 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfd { kill_ptr = conn; } + + pprevconn = &conn->next; conn = conn->next; if (kill_ptr) { + *pprevconn = kill_ptr->next; PICA_close_directc2c(kill_ptr); } } @@ -2234,6 +2363,13 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) fdset_add(&wfds, ic2c->sck_data, &nfds); } + if (ic2c->state == PICA_C2C_STATE_ACTIVE && ic2c->directc2c_state == PICA_DIRECTC2C_STATE_CONNECTING + && ic2c->direct && ic2c->direct->state >= PICA_DIRECTC2C_CONNSTATE_CONNECTING)// CHECK CONDITIONS! + { + fdset_add(&rfds, ic2c->direct->sck, &nfds); + fdset_add(&wfds, ic2c->direct->sck, &nfds); + } + ic2c = ic2c->next; } @@ -2317,7 +2453,7 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) //processing direct c2c connections associated with current c2n if ((*ic2n)->directc2c_config != PICA_DIRECTC2C_CFG_DISABLED) { - process_directc2c(*ic2n); + process_directc2c(*ic2n, &rfds, &wfds); } } ic2n++; @@ -2917,6 +3053,8 @@ void PICA_close_directc2c(struct PICA_directc2c *d) SHUTDOWN(d->sck); CLOSE(d->sck); + d->next = NULL; + free(d); } -- cgit v1.2.1 From 37c34005d93dc10348123f79b2d3110c288a324b Mon Sep 17 00:00:00 2001 From: Anton Date: Tue, 10 Jan 2017 19:48:59 +0400 Subject: implementing directc2c processing, work in progress --- PICA_client.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 0a59af8..239260d 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -61,6 +61,7 @@ static struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned i static int process_first_async_connect_result(int connect_ret); static int check_async_connect_result(int sock, struct sockaddr* a, int addrlen); +static int process_async_ssl_errors(SSL *ssl, int ret); static int PICA_write_c2n(struct PICA_c2n *ci); static int PICA_write_c2c(struct PICA_c2c *chn); @@ -1777,6 +1778,24 @@ int PICA_new_c2c(struct PICA_c2n *ci, const unsigned char *peer_id, struct PICA_ return PICA_OK; } +static int process_async_ssl_errors(SSL *ssl, int ret) +{ + if (ret < 0) + switch(SSL_get_error(ssl, ret)) + { + case SSL_ERROR_WANT_WRITE: + case SSL_ERROR_WANT_READ: + break; + default: + return PICA_ERRSSL; + }; + + if (ret == 0) + return PICA_ERRDISCONNECT; + + return PICA_OK; +} + static int process_first_async_connect_result(int connect_ret) { if (connect_ret == SOCKET_ERROR) @@ -2051,6 +2070,28 @@ static struct PICA_c2c * find_matching_c2c(struct PICA_c2n *c2n, struct PICA_dir return NULL; } +static int directc2c_verify_peer_cert(struct PICA_directc2c *d, struct PICA_c2c *c2c) +{ + unsigned char idbuf[PICA_ID_SIZE]; + + d->peer_cert = SSL_get_peer_certificate(d->ssl); + + if (!d->peer_cert) + return PICA_ERRNOPEERCERT; + + if (PICA_id_from_X509(d->peer_cert, idbuf) == 0) + { + return PICA_ERRNOPEERCERT; + } + + if (memcmp(idbuf, c2c->peer_id, PICA_ID_SIZE) != 0) + { + return PICA_ERRINVPEERCERT; + } + + return PICA_OK; +} + static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) { struct PICA_directc2c *d; @@ -2151,6 +2192,25 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) break; case PICA_DIRECTC2C_CONNSTATE_WAITINGTLS: + if (FD_ISSET(d->sck, wfds) || FD_ISSET(d->sck, rfds)) + { + ret = SSL_connect(d->ssl); + + ret = process_async_ssl_errors(d->ssl, ret); + + if (ret != PICA_OK) + break; + + ret = directc2c_verify_peer_cert(d, c2c); + + if (ret != PICA_OK) + break; + + d->state = PICA_DIRECTC2C_STATE_ACTIVE; + + ---//? send switch message + + } break; case PICA_DIRECTC2C_CONNSTATE_FAILED: @@ -2269,6 +2329,7 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfd if (s >= 0) { + IOCTLSETNONBLOCKINGSOCKET(s, 1); listener_add_connection(lst, s); } } -- cgit v1.2.1 From 02a5141837de5a9370786e208e3e2181380d03a1 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 17 Jun 2017 20:47:51 +0400 Subject: directc2c, work in progress --- PICA_client.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 71 insertions(+), 20 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 239260d..d7928c8 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -633,9 +633,20 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_FAILED(unsigned char* buf, unsi return 1; } -unsigned int procmsg_PICA_PROTO_DIRECTC2C_SWITCH(unsigned char*, unsigned int, void*) +unsigned int procmsg_PICA_PROTO_DIRECTC2C_SWITCH(unsigned char* buf, unsigned int nb, void* p) { - --- + struct PICA_c2c *cc = (struct PICA_c2c *)p; + int ret; + + if (cc->conn->directc2c_config == PICA_DIRECTC2C_CFG_DISABLED) + return 0; + + if (cc->directc2c_state != PICA_DIRECTC2C_STATE_WAITINGINCOMING && cc->directc2c_state != PICA_DIRECTC2C_STATE_CONNECTING) + return 0; + + cc->switched_to_directc2c_read = 1; + + return 1; } static unsigned int procmsg_INITRESP(unsigned char* buf, unsigned int nb, void* p) @@ -2098,6 +2109,8 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) struct PICA_c2c *c2c; int ret; + fputs("process_directc2c()\n", stderr);//debug + //process accepted connections if (c2n->directc2c_listener) { @@ -2117,7 +2130,7 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) c2c->direct = d; - ret = PICA_send_directc2c_switch(c2c);---//??? who should send first? + ret = PICA_send_directc2c_switch(c2c);//??? who should send first? if (ret != PICA_OK) { @@ -2142,7 +2155,7 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) } pdprev = &d->next; d = d->next; - -- killptr? + //-- killptr? } } //process outgoing connections @@ -2183,10 +2196,7 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) } else { - ret = directc2c_connect_next(d, c2c); - - if (ret == PICA_ERRNOTFOUND) - c2c->directc2c_state = PICA_DIRECTC2C_STATE_FAILEDTOCONNECT; + d->state = PICA_DIRECTC2C_CONNSTATE_FAILED; } } break; @@ -2196,29 +2206,42 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) { ret = SSL_connect(d->ssl); - ret = process_async_ssl_errors(d->ssl, ret); + if (ret != 1) + { + ret = process_async_ssl_errors(d->ssl, ret); + + if (ret != PICA_OK) + d->state = PICA_DIRECTC2C_CONNSTATE_FAILED; - if (ret != PICA_OK) break; + } ret = directc2c_verify_peer_cert(d, c2c); if (ret != PICA_OK) break; - d->state = PICA_DIRECTC2C_STATE_ACTIVE; + ret = PICA_send_directc2c_switch(c2c); - ---//? send switch message + if (ret != PICA_OK) + break; + + d->state = PICA_DIRECTC2C_CONNSTATE_ACTIVE; } break; case PICA_DIRECTC2C_CONNSTATE_FAILED: + ret = directc2c_connect_next(d, c2c); + + if (ret == PICA_ERRNOTFOUND) + c2c->directc2c_state = PICA_DIRECTC2C_STATE_FAILEDTOCONNECT; break; case PICA_DIRECTC2C_CONNSTATE_ACTIVE: + c2c->directc2c_state = PICA_DIRECTC2C_STATE_ACTIVE; break; - -- + } if (ret != PICA_OK) @@ -2608,17 +2631,39 @@ int PICA_write_c2c(struct PICA_c2c *chn) int ret = PICA_ERRINVARG; if (chn->state != PICA_C2C_STATE_ACTIVE && chn->state != PICA_C2C_STATE_CONNID && chn->state != PICA_C2C_STATE_WAITINGREP) - { - fputs("PICA_write_c2c() was called for incorrect state!\n", stderr); - exit(-1); - } + { + fputs("PICA_write_c2c() was called for incorrect state!\n", stderr); + exit(-1); + } if (PICA_C2C_STATE_CONNID == chn->state) ret = PICA_write_socket(chn->sck_data, chn->write_buf, &chn->write_pos); else - ret = PICA_write_ssl(chn->ssl, chn->write_buf, &chn->write_pos, &chn->write_sslbytestowrite); + { + SSL *ssl_to_write = chn->ssl; + + if (chn->switched_to_directc2c_write) + ssl_to_write = chn->direct->ssl; + + if (chn->directc2c_write_barrier_pos) + { + if (chn->directc2c_write_before_barrier_pos == 0) + chn->directc2c_write_before_barrier_pos = chn->directc2c_write_barrier_pos; - if (chn->disconnect_on_empty_write_buf) + ret = PICA_write_ssl(chn->ssl, chn->write_buf, &chn->directc2c_write_before_barrier_pos, &chn->write_sslbytestowrite); + + if (ret == PICA_OK && chn->directc2c_write_before_barrier_pos == 0) + { + chn->switched_to_directc2c_write = 1; + memmove(chn->write_buf, chn->write_buf + chn->directc2c_write_barrier_pos, chn->write_pos - chn->directc2c_write_barrier_pos); + chn->directc2c_write_barrier_pos = 0; + } + } + else + ret = PICA_write_ssl(ssl_to_write, chn->write_buf, &chn->write_pos, &chn->write_sslbytestowrite); + } + + if (chn->disconnect_on_empty_write_buf && chn->write_pos == 0) PICA_close_c2c(chn); return ret; @@ -2699,6 +2744,7 @@ int PICA_read_ssl(SSL *ssl, unsigned char *buf, unsigned int *ppos, unsigned int int PICA_read_c2c(struct PICA_c2c *chn) { int ret; + SSL *ssl_to_read = chn->ssl; if (chn->state != PICA_C2C_STATE_WAITINGREP && chn->state != PICA_C2C_STATE_WAITINGC2CPROTOVER && chn->state != PICA_C2C_STATE_ACTIVE) { @@ -2706,7 +2752,10 @@ int PICA_read_c2c(struct PICA_c2c *chn) exit(-1); } - ret = PICA_read_ssl(chn->ssl, chn->read_buf, &chn->read_pos, PICA_CHANREADBUFSIZE); + if (chn->switched_to_directc2c_read) + ssl_to_read = chn->direct->ssl; + + ret = PICA_read_ssl(ssl_to_read, chn->read_buf, &chn->read_pos, PICA_CHANREADBUFSIZE); if (ret == PICA_OK) { @@ -2873,6 +2922,8 @@ static int PICA_send_directc2c_switch(struct PICA_c2c *chn) else return PICA_ERRNOMEM; + chn->directc2c_write_barrier_pos = chn->write_pos; + return PICA_OK; } -- cgit v1.2.1 From e2703cff50b32db08a1746c68a5b25db41e5baa8 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 18 Jun 2017 23:10:08 +0400 Subject: fixing directc2c bugs, work in progress... get rid of c2c/c2n _init_messages arrays; fixed resource release in PICA_new_listener; fixed pointer manipulations in PICA_send_directc2caddrlist --- PICA_client.c | 80 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 37 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index d7928c8..91558d3 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -79,7 +79,9 @@ const struct PICA_msginfo c2n_messages[] = {PICA_PROTO_NOTFOUND, PICA_MSG_FIXED_SIZE, PICA_PROTO_NOTFOUND_SIZE, procmsg_NOTFOUND}, {PICA_PROTO_FOUND, PICA_MSG_FIXED_SIZE, PICA_PROTO_FOUND_SIZE, procmsg_FOUND}, {PICA_PROTO_CLNODELIST, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_CLNODELIST}, - {PICA_PROTO_PINGREQ, PICA_MSG_FIXED_SIZE, PICA_PROTO_PINGREQ_SIZE, procmsg_PINGREQ} + {PICA_PROTO_PINGREQ, PICA_MSG_FIXED_SIZE, PICA_PROTO_PINGREQ_SIZE, procmsg_PINGREQ}, + {PICA_PROTO_INITRESPOK, PICA_MSG_FIXED_SIZE, PICA_PROTO_INITRESPOK_SIZE, procmsg_INITRESP}, + {PICA_PROTO_VERDIFFER, PICA_MSG_FIXED_SIZE, PICA_PROTO_VERDIFFER_SIZE, procmsg_INITRESP} };//---!!! PING!!! const struct PICA_msginfo c2c_messages[] = @@ -93,20 +95,15 @@ const struct PICA_msginfo c2c_messages[] = {PICA_PROTO_FILECONTROL, PICA_MSG_FIXED_SIZE, PICA_PROTO_FILECONTROL_SIZE, procmsg_FILECONTROL}, {PICA_PROTO_DIRECTC2C_ADDRLIST, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST}, {PICA_PROTO_DIRECTC2C_FAILED, PICA_MSG_FIXED_SIZE, PICA_PROTO_DIRECTC2C_FAILED_SIZE, procmsg_PICA_PROTO_DIRECTC2C_FAILED}, - {PICA_PROTO_DIRECTC2C_SWITCH, PICA_MSG_FIXED_SIZE, PICA_PROTO_DIRECTC2C_SWITCH_SIZE, procmsg_PICA_PROTO_DIRECTC2C_SWITCH} -}; - -struct PICA_msginfo c2n_init_messages[] = -{ - {PICA_PROTO_INITRESPOK, PICA_MSG_FIXED_SIZE, PICA_PROTO_INITRESPOK_SIZE, procmsg_INITRESP}, - {PICA_PROTO_VERDIFFER, PICA_MSG_FIXED_SIZE, PICA_PROTO_VERDIFFER_SIZE, procmsg_INITRESP} + {PICA_PROTO_DIRECTC2C_SWITCH, PICA_MSG_FIXED_SIZE, PICA_PROTO_DIRECTC2C_SWITCH_SIZE, procmsg_PICA_PROTO_DIRECTC2C_SWITCH}, + {PICA_PROTO_C2CCONNREQ, PICA_MSG_FIXED_SIZE, PICA_PROTO_C2CCONNREQ_SIZE, procmsg_C2CCONNREQ}, + {PICA_PROTO_INITRESPOK, PICA_MSG_FIXED_SIZE, PICA_PROTO_INITRESPOK_SIZE, procmsg_INITRESP_c2c}, + {PICA_PROTO_VERDIFFER, PICA_MSG_FIXED_SIZE, PICA_PROTO_VERDIFFER_SIZE, procmsg_INITRESP_c2c} }; struct PICA_msginfo c2c_init_messages[] = { - {PICA_PROTO_C2CCONNREQ, PICA_MSG_FIXED_SIZE, PICA_PROTO_C2CCONNREQ_SIZE, procmsg_C2CCONNREQ}, - {PICA_PROTO_INITRESPOK, PICA_MSG_FIXED_SIZE, PICA_PROTO_INITRESPOK_SIZE, procmsg_INITRESP_c2c}, - {PICA_PROTO_VERDIFFER, PICA_MSG_FIXED_SIZE, PICA_PROTO_VERDIFFER_SIZE, procmsg_INITRESP_c2c} + }; // static int pem_passwd_cb(char *buf, int size, int rwflag, void *userdata) @@ -530,15 +527,17 @@ static int directc2c_connect_next(struct PICA_directc2c *dc2c, struct PICA_c2c * if (dc2c->addrpos >= *(uint16_t*)dc2c->addrlist) return PICA_ERRNOTFOUND; - switch(*dc2c->addrpos) + switch(dc2c->addrlist[dc2c->addrpos]) { case PICA_PROTO_DIRECTC2C_IPV4: dc2c->sck = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); memset(&dc2c->addr, 0, sizeof(dc2c->addr)); dc2c->addr.sin_family = AF_INET; - dc2c->addr.sin_addr.s_addr = *((in_addr_t*)(dc2c->addrpos + 1)); - dc2c->addr.sin_port = *((uint16_t*)(dc2c->addrpos + 5)); + dc2c->addr.sin_addr.s_addr = *((in_addr_t*)(dc2c->addrlist + dc2c->addrpos + 1)); + dc2c->addr.sin_port = *((uint16_t*)(dc2c->addrlist + dc2c->addrpos + 5)); + + printf("received direct IPv4 addr %s port %i\n", inet_ntoa(dc2c->addr.sin_addr), ntohs(dc2c->addr.sin_port)); dc2c->state = PICA_DIRECTC2C_CONNSTATE_CONNECTING; @@ -565,6 +564,8 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, un struct PICA_c2c *cc = (struct PICA_c2c *)p; int ret; + fprintf(stderr, "procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST()\n"); + if (cc->conn->directc2c_config != PICA_DIRECTC2C_CFG_DISABLED) { //if (cc->directc2c_state != PICA_DIRECTC2C_STATE_INACTIVE) @@ -653,6 +654,9 @@ static unsigned int procmsg_INITRESP(unsigned char* buf, unsigned int nb, void* { struct PICA_c2n *ci = (struct PICA_c2n *)p; + if (ci->state != PICA_C2N_STATE_WAITINGREP) + return 0; + switch(buf[0]) { case PICA_PROTO_INITRESPOK: @@ -859,6 +863,9 @@ static unsigned int procmsg_MSGUTF8(unsigned char* buf, unsigned int nb, void* p struct PICA_c2c *chan = (struct PICA_c2c *)p; struct PICA_proto_msg *mp; + if (chan->state != PICA_C2C_STATE_ACTIVE) + return 0; + callbacks.newmsg_cb(chan->peer_id, buf + 4, nb - 4, buf[0]); //send PICA_PROTO_MSGOK @@ -1301,7 +1308,10 @@ int PICA_new_listener(const struct PICA_acc *acc, const char *public_addr, int p lst->public_addr_dns = strdup(public_addr); if (!lst->public_addr_dns) - return PICA_ERRNOMEM; + { + ret_err = PICA_ERRNOMEM; + goto error_ret_0; + } lst->public_addr_ipv4 = inet_addr(public_addr); @@ -1352,6 +1362,9 @@ error_ret_2: //(2) error_ret_1: //(1) free(lst->public_addr_dns); + +error_ret_0: //(0) + free(lst); *l = 0; @@ -2109,8 +2122,6 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) struct PICA_c2c *c2c; int ret; - fputs("process_directc2c()\n", stderr);//debug - //process accepted connections if (c2n->directc2c_listener) { @@ -2121,6 +2132,7 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) while(d) { + fprintf(stderr, "processing accepted direct connection\n"); if (d->state == PICA_DIRECTC2C_CONNSTATE_ACTIVE) { if ((c2c = find_matching_c2c(c2n, d))) @@ -2352,6 +2364,7 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfd if (s >= 0) { + fprintf(stderr, "accepted direct connection on socket %i\n", s); IOCTLSETNONBLOCKINGSOCKET(s, 1); listener_add_connection(lst, s); } @@ -2362,13 +2375,16 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfd while(conn) { + int ret; struct PICA_directc2c *kill_ptr = NULL; - if (process_listener_conn(conn, rfds, wfds) != PICA_OK) + if ((ret = process_listener_conn(conn, rfds, wfds)) != PICA_OK) { kill_ptr = conn; } + fprintf(stderr, "process_listener_conn() returned %i\n", ret); + pprevconn = &conn->next; conn = conn->next; @@ -2762,16 +2778,8 @@ int PICA_read_c2c(struct PICA_c2c *chn) const struct PICA_msginfo *msgs; unsigned int nmsgs; - if (chn->state == PICA_C2C_STATE_ACTIVE) - { - nmsgs = MSGINFO_MSGSNUM(c2c_messages); - msgs = c2c_messages; - } - else - { - nmsgs = MSGINFO_MSGSNUM(c2c_init_messages); - msgs = c2c_init_messages; - } + nmsgs = MSGINFO_MSGSNUM(c2c_messages); + msgs = c2c_messages; if(!PICA_processdatastream(chn->read_buf, &(chn->read_pos ), chn, msgs, nmsgs)) return PICA_ERRSERV; @@ -2796,13 +2804,8 @@ int PICA_read_c2n(struct PICA_c2n *ci) if (ret == PICA_OK) { - if (PICA_C2N_STATE_WAITINGREP == ci->state) - if(!PICA_processdatastream( ci->read_buf, &(ci->read_pos), ci, c2n_init_messages, MSGINFO_MSGSNUM(c2n_init_messages))) - return PICA_ERRSERV; - - if (PICA_C2N_STATE_CONNECTED == ci->state) - if(!PICA_processdatastream( ci->read_buf, &(ci->read_pos), ci, c2n_messages, MSGINFO_MSGSNUM(c2n_messages))) - return PICA_ERRSERV; + if(!PICA_processdatastream( ci->read_buf, &(ci->read_pos), ci, c2n_messages, MSGINFO_MSGSNUM(c2n_messages))) + return PICA_ERRSERV; } return ret; @@ -2876,6 +2879,7 @@ struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned int msgi int PICA_send_directc2caddrlist(struct PICA_c2c *chn) { + fprintf(stderr, "PICA_send_directc2caddrlist()\n"); if (chn->conn->directc2c_config == PICA_DIRECTC2C_CFG_ALLOWINCOMING && chn->conn->directc2c_listener) { struct PICA_proto_msg *mp; @@ -2886,8 +2890,8 @@ int PICA_send_directc2caddrlist(struct PICA_c2c *chn) { *((uint16_t*)mp->tail) = len; *((uint8_t*)mp->tail + 2) = PICA_PROTO_DIRECTC2C_IPV4; - *((uint32_t*)mp->tail + 3) = chn->conn->directc2c_listener->public_addr_ipv4; - *((uint16_t*)mp->tail + 7) = htons(chn->conn->directc2c_listener->public_port); + *((uint32_t*)(mp->tail + 3)) = chn->conn->directc2c_listener->public_addr_ipv4; + *((uint16_t*)(mp->tail + 7)) = htons(chn->conn->directc2c_listener->public_port); if (chn->outgoing == PICA_C2C_INCOMING) chn->directc2c_state = PICA_DIRECTC2C_STATE_WAITINGINCOMING; @@ -2899,6 +2903,7 @@ int PICA_send_directc2caddrlist(struct PICA_c2c *chn) static int PICA_send_directc2cfailed(struct PICA_c2c *chn) { + fprintf(stderr, "PICA_send_directc2cfailed()\n"); struct PICA_proto_msg *mp; if ((mp = c2c_writebuf_push(chn, PICA_PROTO_DIRECTC2C_FAILED, PICA_PROTO_DIRECTC2C_FAILED_SIZE))) @@ -2913,6 +2918,7 @@ static int PICA_send_directc2cfailed(struct PICA_c2c *chn) static int PICA_send_directc2c_switch(struct PICA_c2c *chn) { + fputs("PICA_send_directc2c_switch()\n", stderr);//debug struct PICA_proto_msg *mp; if ((mp = c2c_writebuf_push(chn, PICA_PROTO_DIRECTC2C_SWITCH, PICA_PROTO_DIRECTC2C_SWITCH_SIZE))) -- cgit v1.2.1 From e18087e95337faa292507ba0027b84e944df8150 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 25 Jun 2017 20:24:33 +0400 Subject: fixed bugs in directc2c processing --- PICA_client.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 91558d3..456b7d3 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -531,6 +531,7 @@ static int directc2c_connect_next(struct PICA_directc2c *dc2c, struct PICA_c2c * { case PICA_PROTO_DIRECTC2C_IPV4: dc2c->sck = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + IOCTLSETNONBLOCKINGSOCKET(dc2c->sck, 1); memset(&dc2c->addr, 0, sizeof(dc2c->addr)); dc2c->addr.sin_family = AF_INET; @@ -642,7 +643,7 @@ unsigned int procmsg_PICA_PROTO_DIRECTC2C_SWITCH(unsigned char* buf, unsigned in if (cc->conn->directc2c_config == PICA_DIRECTC2C_CFG_DISABLED) return 0; - if (cc->directc2c_state != PICA_DIRECTC2C_STATE_WAITINGINCOMING && cc->directc2c_state != PICA_DIRECTC2C_STATE_CONNECTING) + if (cc->directc2c_state != PICA_DIRECTC2C_STATE_ACTIVE && cc->directc2c_state != PICA_DIRECTC2C_STATE_CONNECTING) return 0; cc->switched_to_directc2c_read = 1; @@ -1804,6 +1805,9 @@ int PICA_new_c2c(struct PICA_c2n *ci, const unsigned char *peer_id, struct PICA_ static int process_async_ssl_errors(SSL *ssl, int ret) { + if (ret == 0) + return PICA_ERRDISCONNECT; + if (ret < 0) switch(SSL_get_error(ssl, ret)) { @@ -1814,9 +1818,6 @@ static int process_async_ssl_errors(SSL *ssl, int ret) return PICA_ERRSSL; }; - if (ret == 0) - return PICA_ERRDISCONNECT; - return PICA_OK; } @@ -2033,7 +2034,8 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) case PICA_C2C_STATE_ACTIVE: - if (FD_ISSET(c2c->sck_data, wfds)) + if (FD_ISSET(c2c->sck_data, wfds) + || c2c->directc2c_state == PICA_DIRECTC2C_STATE_ACTIVE && FD_ISSET(c2c->direct->sck, wfds)) { if (c2c->write_pos > 0) { @@ -2045,7 +2047,8 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) } } - if (ret == PICA_OK && FD_ISSET(c2c->sck_data, rfds)) + if (ret == PICA_OK && (FD_ISSET(c2c->sck_data, rfds) + || c2c->directc2c_state == PICA_DIRECTC2C_STATE_ACTIVE && FD_ISSET(c2c->direct->sck, rfds))) { ret = PICA_read_c2c(c2c); } @@ -2090,7 +2093,6 @@ static struct PICA_c2c * find_matching_c2c(struct PICA_c2n *c2n, struct PICA_dir } c2c = c2c->next; } - return NULL; } @@ -2237,7 +2239,7 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) if (ret != PICA_OK) break; - + fprintf(stderr, "outgoing directc2c is PICA_DIRECTC2C_CONNSTATE_ACTIVE\n"); d->state = PICA_DIRECTC2C_CONNSTATE_ACTIVE; } @@ -2463,7 +2465,7 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) fdset_add(&wfds, ic2c->sck_data, &nfds); } - if (ic2c->state == PICA_C2C_STATE_ACTIVE && ic2c->directc2c_state == PICA_DIRECTC2C_STATE_CONNECTING + if (ic2c->state == PICA_C2C_STATE_ACTIVE && (ic2c->directc2c_state == PICA_DIRECTC2C_STATE_CONNECTING || ic2c->directc2c_state == PICA_DIRECTC2C_STATE_ACTIVE) && ic2c->direct && ic2c->direct->state >= PICA_DIRECTC2C_CONNSTATE_CONNECTING)// CHECK CONDITIONS! { fdset_add(&rfds, ic2c->direct->sck, &nfds); @@ -2672,6 +2674,7 @@ int PICA_write_c2c(struct PICA_c2c *chn) { chn->switched_to_directc2c_write = 1; memmove(chn->write_buf, chn->write_buf + chn->directc2c_write_barrier_pos, chn->write_pos - chn->directc2c_write_barrier_pos); + chn->write_pos -= chn->directc2c_write_barrier_pos; chn->directc2c_write_barrier_pos = 0; } } -- cgit v1.2.1 From 705fb54609386b65e4b8b973082fb37408db553c Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 25 Jun 2017 22:13:41 +0400 Subject: new macro PICA_TRACEFUNC to print func name; fixed releasing resources for failed direct connections --- PICA_client.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 13 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 456b7d3..0488737 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -7,6 +7,12 @@ #define PICA_DEBUG // debug +#ifdef PICA_DEBUG +#define PICA_TRACEFUNC fprintf(stderr, "%s()\n", __PRETTY_FUNCTION__); +#else +#define PICA_TRACEFUNC +#endif + //static SSL_CTX* ctx; //unsigned char __hellomsg[4]={0xCA,0xCA,PICA_PROTO_VER_HIGH,PICA_PROTO_VER_LOW}; @@ -519,8 +525,16 @@ static unsigned int procmsg_INITRESP_c2c(unsigned char* buf, unsigned int nb, vo static int directc2c_connect_next(struct PICA_directc2c *dc2c, struct PICA_c2c *c2c) { + PICA_TRACEFUNC int ret; + if (dc2c->ssl) + SSL_free(dc2c->ssl); + dc2c->ssl = NULL; + if (dc2c->sck >= 0) + CLOSE(dc2c->sck); + dc2c->sck = -1; + if (dc2c->addrpos == 0) dc2c->addrpos += 2; @@ -562,11 +576,10 @@ static int directc2c_connect_next(struct PICA_directc2c *dc2c, struct PICA_c2c * static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, unsigned int nb, void* p) { + PICA_TRACEFUNC struct PICA_c2c *cc = (struct PICA_c2c *)p; int ret; - fprintf(stderr, "procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST()\n"); - if (cc->conn->directc2c_config != PICA_DIRECTC2C_CFG_DISABLED) { //if (cc->directc2c_state != PICA_DIRECTC2C_STATE_INACTIVE) @@ -614,6 +627,7 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, un static unsigned int procmsg_PICA_PROTO_DIRECTC2C_FAILED(unsigned char* buf, unsigned int nb, void* p) { + PICA_TRACEFUNC struct PICA_c2c *cc = (struct PICA_c2c *)p; int ret; @@ -637,6 +651,7 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_FAILED(unsigned char* buf, unsi unsigned int procmsg_PICA_PROTO_DIRECTC2C_SWITCH(unsigned char* buf, unsigned int nb, void* p) { + PICA_TRACEFUNC struct PICA_c2c *cc = (struct PICA_c2c *)p; int ret; @@ -794,6 +809,7 @@ static unsigned int procmsg_FOUND(unsigned char* buf, unsigned int nb, void* p) static unsigned int procmsg_CLNODELIST(unsigned char* buf, unsigned int nb, void* p) { + PICA_TRACEFUNC unsigned int pos = 4; char ipaddr_string[INET6_ADDRSTRLEN]; char temp_zeroswap; @@ -892,6 +908,7 @@ static unsigned int procmsg_MSGOK(unsigned char* buf, unsigned int nb, void* p) unsigned int procmsg_PINGREQ(unsigned char* buf, unsigned int nb, void* p) { + PICA_TRACEFUNC struct PICA_c2n *ci = (struct PICA_c2n *)p; struct PICA_proto_msg *mp; @@ -1481,6 +1498,7 @@ error_ret_1: //(1) static int c2n_stage2_sendreq(struct PICA_c2n *c2n) { + PICA_TRACEFUNC struct PICA_proto_msg *mp; puts("c2n_stage2_sendreq");//debug @@ -1502,6 +1520,7 @@ static int c2n_stage2_sendreq(struct PICA_c2n *c2n) static int c2n_stage3_starttls(struct PICA_c2n *c2n) { + PICA_TRACEFUNC int ret; ret = SSL_set_fd(c2n->ssl_comm, c2n->sck_comm); @@ -1529,6 +1548,7 @@ static int c2n_stage3_starttls(struct PICA_c2n *c2n) static int c2n_stage4_nodelistrequest(struct PICA_c2n *c2n) { + PICA_TRACEFUNC struct PICA_proto_msg *mp; mp = c2n_writebuf_push(c2n, PICA_PROTO_CLNODELISTREQ, PICA_PROTO_CLNODELISTREQ_SIZE); @@ -1549,6 +1569,7 @@ static int c2n_stage4_nodelistrequest(struct PICA_c2n *c2n) static int directc2c_stage2_starttls(struct PICA_directc2c *d, struct PICA_c2c *c2c) { + PICA_TRACEFUNC int ret; d->ssl = SSL_new(c2c->acc->ctx); @@ -1595,6 +1616,7 @@ int PICA_new_c2n(const struct PICA_acc *acc, const char *nodeaddr, unsigned int enum PICA_directc2c_config direct_c2c_mode, struct PICA_listener *l, struct PICA_c2n **ci) { + PICA_TRACEFUNC int ret, ret_err; struct PICA_c2n *cid; struct sockaddr_in a; @@ -1776,6 +1798,7 @@ error_ret_1: //(1) // в данный момент. int PICA_new_c2c(struct PICA_c2n *ci, const unsigned char *peer_id, struct PICA_listener *l, struct PICA_c2c **chn) { + PICA_TRACEFUNC struct PICA_proto_msg *mp; struct PICA_c2c *chnl; @@ -1805,6 +1828,7 @@ int PICA_new_c2c(struct PICA_c2n *ci, const unsigned char *peer_id, struct PICA_ static int process_async_ssl_errors(SSL *ssl, int ret) { + PICA_TRACEFUNC if (ret == 0) return PICA_ERRDISCONNECT; @@ -1823,6 +1847,7 @@ static int process_async_ssl_errors(SSL *ssl, int ret) static int process_first_async_connect_result(int connect_ret) { + PICA_TRACEFUNC if (connect_ret == SOCKET_ERROR) { #ifndef WIN32 @@ -1841,6 +1866,7 @@ static int process_first_async_connect_result(int connect_ret) static int check_async_connect_result(int sock, struct sockaddr* a, int addrlen) { + PICA_TRACEFUNC int ret = PICA_ERRSOCK; #ifndef WIN32 @@ -2074,6 +2100,7 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) static struct PICA_c2c * find_matching_c2c(struct PICA_c2n *c2n, struct PICA_directc2c *d) { + PICA_TRACEFUNC struct PICA_c2c *c2c; unsigned char idbuf[PICA_ID_SIZE]; @@ -2098,6 +2125,7 @@ static struct PICA_c2c * find_matching_c2c(struct PICA_c2n *c2n, struct PICA_dir static int directc2c_verify_peer_cert(struct PICA_directc2c *d, struct PICA_c2c *c2c) { + PICA_TRACEFUNC unsigned char idbuf[PICA_ID_SIZE]; d->peer_cert = SSL_get_peer_certificate(d->ssl); @@ -2225,7 +2253,9 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) ret = process_async_ssl_errors(d->ssl, ret); if (ret != PICA_OK) + { d->state = PICA_DIRECTC2C_CONNSTATE_FAILED; + } break; } @@ -2233,12 +2263,19 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) ret = directc2c_verify_peer_cert(d, c2c); if (ret != PICA_OK) + { + d->state = PICA_DIRECTC2C_CONNSTATE_FAILED; break; + } ret = PICA_send_directc2c_switch(c2c); if (ret != PICA_OK) + { + d->state = PICA_DIRECTC2C_CONNSTATE_FAILED; break; + } + fprintf(stderr, "outgoing directc2c is PICA_DIRECTC2C_CONNSTATE_ACTIVE\n"); d->state = PICA_DIRECTC2C_CONNSTATE_ACTIVE; @@ -2249,7 +2286,11 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) ret = directc2c_connect_next(d, c2c); if (ret == PICA_ERRNOTFOUND) + { + PICA_close_directc2c(d); + c2c->direct = 0; c2c->directc2c_state = PICA_DIRECTC2C_STATE_FAILEDTOCONNECT; + } break; case PICA_DIRECTC2C_CONNSTATE_ACTIVE: @@ -2258,14 +2299,14 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) } - if (ret != PICA_OK) - { - PICA_close_directc2c(d); - c2c->direct = 0; +// if (ret != PICA_OK) +// { +// PICA_close_directc2c(d); +// c2c->direct = 0; - if (c2c->directc2c_state != PICA_DIRECTC2C_STATE_FAILEDTOCONNECT) - c2c->directc2c_state = PICA_DIRECTC2C_STATE_INACTIVE;//fallback to c2c through node? - } +// if (c2c->directc2c_state != PICA_DIRECTC2C_STATE_FAILEDTOCONNECT) +// c2c->directc2c_state = PICA_DIRECTC2C_STATE_INACTIVE;//fallback to c2c through node? +// } } c2c = c2c->next; @@ -2274,6 +2315,7 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) static void listener_add_connection(struct PICA_listener *lst, SOCKET *s) { + PICA_TRACEFUNC struct PICA_directc2c *nc; int ret; @@ -2882,7 +2924,7 @@ struct PICA_proto_msg* c2c_writebuf_push(struct PICA_c2c *chn, unsigned int msgi int PICA_send_directc2caddrlist(struct PICA_c2c *chn) { - fprintf(stderr, "PICA_send_directc2caddrlist()\n"); + PICA_TRACEFUNC if (chn->conn->directc2c_config == PICA_DIRECTC2C_CFG_ALLOWINCOMING && chn->conn->directc2c_listener) { struct PICA_proto_msg *mp; @@ -2906,7 +2948,7 @@ int PICA_send_directc2caddrlist(struct PICA_c2c *chn) static int PICA_send_directc2cfailed(struct PICA_c2c *chn) { - fprintf(stderr, "PICA_send_directc2cfailed()\n"); + PICA_TRACEFUNC struct PICA_proto_msg *mp; if ((mp = c2c_writebuf_push(chn, PICA_PROTO_DIRECTC2C_FAILED, PICA_PROTO_DIRECTC2C_FAILED_SIZE))) @@ -2921,7 +2963,7 @@ static int PICA_send_directc2cfailed(struct PICA_c2c *chn) static int PICA_send_directc2c_switch(struct PICA_c2c *chn) { - fputs("PICA_send_directc2c_switch()\n", stderr);//debug + PICA_TRACEFUNC struct PICA_proto_msg *mp; if ((mp = c2c_writebuf_push(chn, PICA_PROTO_DIRECTC2C_SWITCH, PICA_PROTO_DIRECTC2C_SWITCH_SIZE))) @@ -3164,6 +3206,7 @@ int PICA_send_file_fragment(struct PICA_c2c *chn) } void PICA_close_directc2c(struct PICA_directc2c *d) { + PICA_TRACEFUNC if (d->peer_cert) X509_free(d->peer_cert); @@ -3183,7 +3226,7 @@ void PICA_close_c2c(struct PICA_c2c *chn) { struct PICA_c2c *ipt; - fprintf(stderr, "PICA_close_c2c(%p)\n", chn);//debug + PICA_TRACEFUNC ipt = chn->conn->chan_list_head; //puts("PICA_close_c2c_chkp0");//debug @@ -3249,6 +3292,7 @@ void PICA_close_c2c(struct PICA_c2c *chn) void PICA_close_c2n(struct PICA_c2n *cid) { + PICA_TRACEFUNC struct PICA_c2c *ipt; while((ipt = cid->chan_list_head)) -- cgit v1.2.1 From 41117d6c03271b971e48c5d5989168f826dfddcd Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 26 Jun 2017 18:42:09 +0400 Subject: fixed directc2c logic for cases when receiver side does not wait for incoming direct connection --- PICA_client.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index 0488737..d9f26df 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -582,16 +582,10 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, un if (cc->conn->directc2c_config != PICA_DIRECTC2C_CFG_DISABLED) { - //if (cc->directc2c_state != PICA_DIRECTC2C_STATE_INACTIVE) - // return 1; - - //if (cc->outgoing == PICA_C2C_OUTGOING) - // cc->directc2c_state = PICA_DIRECTC2C_STATE_CONNECTING; - //else if (cc->outgoing == PICA_C2C_INCOMING) - // cc->directc2c_state = PICA_DIRECTC2C_STATE_WAITINGINCOMING; - //else - // return 0; - if (cc->directc2c_state != PICA_DIRECTC2C_STATE_WAITINGINCOMING) + if (cc->directc2c_state != PICA_DIRECTC2C_STATE_INACTIVE && cc->directc2c_state != PICA_DIRECTC2C_STATE_WAITINGINCOMING) + return 0; + + if (cc->outgoing == PICA_C2C_OUTGOING || cc->conn->directc2c_config == PICA_DIRECTC2C_CFG_CONNECTONLY) cc->directc2c_state = PICA_DIRECTC2C_STATE_CONNECTING; cc->direct = calloc(1, sizeof(struct PICA_directc2c)); @@ -611,7 +605,7 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_ADDRLIST(unsigned char* buf, un cc->direct->addrlist[nb - 2] = 0; cc->direct->addrpos = 0; - if (cc->directc2c_state == PICA_DIRECTC2C_STATE_WAITINGINCOMING) + if (cc->outgoing == PICA_C2C_INCOMING && cc->conn->directc2c_config == PICA_DIRECTC2C_CFG_ALLOWINCOMING) return 1;//connect later, if no incoming connection is accepted and DIRECTC2C_FAILED is received ret = directc2c_connect_next(cc->direct, cc); @@ -637,6 +631,9 @@ static unsigned int procmsg_PICA_PROTO_DIRECTC2C_FAILED(unsigned char* buf, unsi if (cc->conn->directc2c_config == PICA_DIRECTC2C_CFG_DISABLED) return 0; + if (cc->outgoing != PICA_C2C_INCOMING) + return 0; + ret = directc2c_connect_next(cc->direct, cc); if (ret == PICA_ERRNOTFOUND) @@ -2938,8 +2935,7 @@ int PICA_send_directc2caddrlist(struct PICA_c2c *chn) *((uint32_t*)(mp->tail + 3)) = chn->conn->directc2c_listener->public_addr_ipv4; *((uint16_t*)(mp->tail + 7)) = htons(chn->conn->directc2c_listener->public_port); - if (chn->outgoing == PICA_C2C_INCOMING) - chn->directc2c_state = PICA_DIRECTC2C_STATE_WAITINGINCOMING; + chn->directc2c_state = PICA_DIRECTC2C_STATE_WAITINGINCOMING; } } -- cgit v1.2.1 From 9b2132d83ab2ea8fa60cdb7ebfebf10f7c62c470 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 26 Jun 2017 19:11:47 +0400 Subject: fixed memory leak in PICA_get_id_from_cert_file() --- PICA_client.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index d9f26df..d488a16 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -155,6 +155,7 @@ int PICA_get_id_from_cert_file(const char *cert_file, unsigned char *id) { X509 *x; FILE *f; + int ret; f = fopen(cert_file, "r"); @@ -172,7 +173,10 @@ int PICA_get_id_from_cert_file(const char *cert_file, unsigned char *id) return 0; } - return PICA_id_from_X509(x, id); + ret = PICA_id_from_X509(x, id); + X509_free(x); + + return ret; } int PICA_get_id_from_cert_string(const char *cert_pem, unsigned char *id) -- cgit v1.2.1 From 1ba81a25b54881d0519963df31ef85f45ea30a87 Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 20 Jul 2017 19:30:18 +0400 Subject: fixed removing PICA_directc2c from listener's accepted connections list --- PICA_client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index d488a16..ad4c3eb 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -2430,7 +2430,9 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfd fprintf(stderr, "process_listener_conn() returned %i\n", ret); - pprevconn = &conn->next; + if (!kill_ptr) + pprevconn = &conn->next; + conn = conn->next; if (kill_ptr) @@ -2438,6 +2440,7 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfd *pprevconn = kill_ptr->next; PICA_close_directc2c(kill_ptr); } + } return PICA_OK; -- cgit v1.2.1 From ced679b1e7896b0df7215d842d2122d8c8f40edf Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 12 Nov 2017 22:06:30 +0400 Subject: added flag want_write, fixed conditions for adding sockets to write FD set for select() in order to prevent CPU wasting loops --- PICA_client.c | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'PICA_client.c') diff --git a/PICA_client.c b/PICA_client.c index ad4c3eb..60ea14e 100644 --- a/PICA_client.c +++ b/PICA_client.c @@ -1954,6 +1954,9 @@ static int process_c2n(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) if (sslret != SSL_ERROR_WANT_READ && sslret != SSL_ERROR_WANT_WRITE) ret = PICA_ERRSSL; + + if (sslret == SSL_ERROR_WANT_WRITE) + c2n->want_write = 1; } } @@ -2026,6 +2029,8 @@ static int process_c2c(struct PICA_c2c *c2c, fd_set *rfds, fd_set *wfds) if (sslret != SSL_ERROR_WANT_READ && sslret != SSL_ERROR_WANT_WRITE) ret = PICA_ERRSSL; + if (sslret == SSL_ERROR_WANT_WRITE) + c2c->want_write = 1; } else if(sslret == 0) { @@ -2251,6 +2256,9 @@ static void process_directc2c(struct PICA_c2n *c2n, fd_set *rfds, fd_set *wfds) if (ret != 1) { + if (SSL_get_error(d->ssl, ret)== SSL_ERROR_WANT_WRITE) + d->want_write = 1; + ret = process_async_ssl_errors(d->ssl, ret); if (ret != PICA_OK) @@ -2385,6 +2393,9 @@ static int process_listener_conn(struct PICA_directc2c *conn, fd_set *rfds, fd_s { ret = SSL_get_error(conn->ssl, ret); + if (ret == SSL_ERROR_WANT_WRITE) + conn->want_write = 1; + if (ret != SSL_ERROR_WANT_READ && ret != SSL_ERROR_WANT_WRITE) return PICA_ERRSSL; } @@ -2428,7 +2439,7 @@ static int process_listener(struct PICA_listener *lst, fd_set *rfds, fd_set *wfd kill_ptr = conn; } - fprintf(stderr, "process_listener_conn() returned %i\n", ret); + //fprintf(stderr, "process_listener_conn() returned %i\n", ret); if (!kill_ptr) pprevconn = &conn->next; @@ -2481,8 +2492,11 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) fdset_add(&rfds, (*ic2n)->sck_comm, &nfds); if ((*ic2n)->write_pos || (*ic2n)->state == PICA_C2N_STATE_CONNECTING - || (*ic2n)->state == PICA_C2N_STATE_WAITINGTLS) + || (*ic2n)->want_write/*(*ic2n)->state == PICA_C2N_STATE_WAITINGTLS*/) + { + (*ic2n)->want_write = 0; fdset_add(&wfds, (*ic2n)->sck_comm, &nfds); + } if ((*ic2n)->directc2c_listener) { @@ -2493,7 +2507,11 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) while (ilstcon) { fdset_add(&rfds, ilstcon->sck, &nfds); - fdset_add(&wfds, ilstcon->sck, &nfds); + + if (ilstcon->want_write) + fdset_add(&wfds, ilstcon->sck, &nfds); + ilstcon->want_write = 0; + ilstcon = ilstcon->next; } } @@ -2506,16 +2524,24 @@ int PICA_event_loop(struct PICA_c2n **connections, int timeout) { fdset_add(&rfds, ic2c->sck_data, &nfds); - if (ic2c->write_pos || ic2c->state == PICA_C2C_STATE_CONNECTING || ic2c->state == PICA_C2C_STATE_WAITINGTLS - || ic2c->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) + if ((ic2c->write_pos || ic2c->state == PICA_C2C_STATE_CONNECTING || (ic2c->state == PICA_C2C_STATE_WAITINGTLS && ic2c->want_write) + || ic2c->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) && ic2c->directc2c_state != PICA_DIRECTC2C_STATE_ACTIVE) + { + ic2c->want_write = 0; fdset_add(&wfds, ic2c->sck_data, &nfds); + } } if (ic2c->state == PICA_C2C_STATE_ACTIVE && (ic2c->directc2c_state == PICA_DIRECTC2C_STATE_CONNECTING || ic2c->directc2c_state == PICA_DIRECTC2C_STATE_ACTIVE) - && ic2c->direct && ic2c->direct->state >= PICA_DIRECTC2C_CONNSTATE_CONNECTING)// CHECK CONDITIONS! + && ic2c->direct && ic2c->direct->state >= PICA_DIRECTC2C_CONNSTATE_CONNECTING) { fdset_add(&rfds, ic2c->direct->sck, &nfds); - fdset_add(&wfds, ic2c->direct->sck, &nfds); + + if (ic2c->write_pos || ic2c->direct->state == PICA_DIRECTC2C_CONNSTATE_CONNECTING || ic2c->direct->want_write || ic2c->sendfilestate == PICA_CHANSENDFILESTATE_SENDING) + { + ic2c->direct->want_write = 0; + fdset_add(&wfds, ic2c->direct->sck, &nfds); + } } ic2c = ic2c->next; -- cgit v1.2.1