From 38d33c1c978891b401b43e176e9e4e12593a9f5f Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Wed, 22 Oct 2014 17:03:40 -0700 Subject: [PATCH] all packets compiling. bloom filters still have issues. --- src/bitcoindjs.cc | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/bitcoindjs.cc b/src/bitcoindjs.cc index 701aa2b9..e312162e 100644 --- a/src/bitcoindjs.cc +++ b/src/bitcoindjs.cc @@ -3769,8 +3769,8 @@ NAN_METHOD(HookPackets) { //o->Set(NanNew("hashFuncs"), NanNew(filter.nHashFuncs)); //o->Set(NanNew("tweaks"), NanNew(filter.nTweak)); //o->Set(NanNew("flags"), NanNew(filter.nFlags)); + o->Set(NanNew("misbehaving"), NanNew(false)); } -#if 0 } else if (strCommand == "filteradd") { vector vData; *cur->vRecv >> vData; @@ -3782,17 +3782,19 @@ NAN_METHOD(HookPackets) { } else { LOCK(cur->pfrom->cs_filter); if (cur->pfrom->pfilter) { + //std::string svData(vData.begin(), vData.end()); + //char *cvData = svData.c_str(); + //int vDataHexLen = sizeof(char) * (strlen(cvData) * 2) + 1; + //char *vDataHex = (char *)malloc(vDataHexLen); + //int written = snprintf(vDataHex, vDataHexLen, "%x", cvData); + //uint64_t dataHex; + //sscanf(cvData, "%x", &dataHex); + //// assert(written == vDataHexLen); + //vDataHex[written] = '\0'; - std::string svData(vData.begin(), vData.end()); - char *cvData = svData.c_str(); - int vDataHexLen = sizeof(char) * (strlen(cvData) * 2) + 1; - char *vDataHex = (char *)malloc(vDataHexLen); - int written = snprintf(vDataHex, vDataHexLen, "%x", cvData); - // assert(written == vDataHexLen); - vDataHex[written] = '\0'; - - o->Set(NanNew("data"), NanNew(vDataHex)); - free(vDataHex); + //o->Set(NanNew("data"), NanNew(vDataHex)); + //free(vDataHex); + o->Set(NanNew("misbehaving"), NanNew(false)); } else { o->Set(NanNew("misbehaving"), NanNew(true)); } @@ -3801,7 +3803,6 @@ NAN_METHOD(HookPackets) { ; // nothing much to grab from this packet } else if (strCommand == "reject") { ; // nothing much to grab from this packet -#endif } else { o->Set(NanNew("unknown"), NanNew(true)); }