diff --git a/exec/load/binkp.js b/exec/load/binkp.js index b15fc2712f63a05c5a4b3d4c9f0bd1eba00cae6e..0e6336ede1d7f1c4f3efbdc2c6941db6e7ebad98 100644 --- a/exec/load/binkp.js +++ b/exec/load/binkp.js @@ -249,6 +249,10 @@ BinkP.prototype.send_chunks = function(str) { var sent = 0; while (sent < str.length) { + if (this.sock.poll(this.timeout, /* write: */true) == 0) { + log(LOG_WARNING, "TIMEOUT of socket poll() for write"); + return false; + } ret = this.sock.send(str.substr(sent)); if (ret > 0) sent += ret; diff --git a/src/sbbs3/un_qwk.cpp b/src/sbbs3/un_qwk.cpp index f7e73baab667ca6325a566f5d12171570a288ebd..7218c961442a9853a8b7228fd28911ded68bbcd5 100644 --- a/src/sbbs3/un_qwk.cpp +++ b/src/sbbs3/un_qwk.cpp @@ -166,8 +166,6 @@ bool sbbs_t::unpack_qwk(char *packet,uint hubnum) n=(uint)block[123]|(((uint)block[124])<<8); /* conference number */ if(blocks<2) { if(block[0] == 'V' && blocks == 1 && voting != NULL) { /* VOTING DATA */ - if(qwk_msg_filtered(&msg, ip_can, host_can, subject_can, twit_list)) - continue; if(!qwk_voting(&voting, l, NET_QWK, cfg.qhub[hubnum]->id, n, hubnum)) { lprintf(LOG_WARNING, "QWK vote failure, offset %lu in %s", l, packet); errors++; diff --git a/src/sbbs3/un_rep.cpp b/src/sbbs3/un_rep.cpp index bc4403d60c96e69b50c88d77af12a6d350329726..18dc112284f5ab806428dccd05fac7ad84aadf65 100644 --- a/src/sbbs3/un_rep.cpp +++ b/src/sbbs3/un_rep.cpp @@ -197,8 +197,6 @@ bool sbbs_t::unpack_rep(char* repfile) long confnum = atol((char *)block+1); if(blocks<2) { if(block[0] == 'V' && blocks == 1 && voting != NULL) { /* VOTING DATA */ - if(qwk_msg_filtered(&msg, ip_can, host_can, subject_can, twit_list)) - continue; if(!qwk_voting(&voting, l, (useron.rest&FLAG('Q')) ? NET_QWK : NET_NONE, /* QWKnet ID : */useron.alias, confnum)) { lprintf(LOG_WARNING, "QWK vote failure, offset %ld of %s", l, getfname(msg_fname)); errors++;