From ed11bc535230397e78aa1887a15416e6af00f78a Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Wed, 22 Oct 2014 17:01:40 -0700 Subject: [PATCH] "filterload" compiling with issues. --- src/bitcoindjs.cc | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/bitcoindjs.cc b/src/bitcoindjs.cc index 0507f09e..701aa2b9 100644 --- a/src/bitcoindjs.cc +++ b/src/bitcoindjs.cc @@ -3741,7 +3741,6 @@ NAN_METHOD(HookPackets) { o->Set(NanNew("misbehaving"), NanNew(true)); } } -#if 0 } else if (strCommand == "filterload") { CBloomFilter filter; *cur->vRecv >> filter; @@ -3753,23 +3752,25 @@ NAN_METHOD(HookPackets) { LOCK(cur->pfrom->cs_filter); filter.UpdateEmptyFull(); - // std::vector vData; - std::string svData(filter.vData.begin(), filter.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'; + //std::string svData(filter.vData.begin(), filter.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'; - o->Set(NanNew("data"), NanNew(vDataHex)); - free(vDataHex); - o->Set(NanNew("full"), NanNew(filter.isFull)); - o->Set(NanNew("empty"), NanNew(filter.isEmpty)); - o->Set(NanNew("hashFuncs"), NanNew(filter.nHashFuncs)); - o->Set(NanNew("tweaks"), NanNew(filter.nTweak)); - o->Set(NanNew("flags"), NanNew(filter.nFlags)); + //o->Set(NanNew("data"), NanNew(vDataHex)); + //free(vDataHex); + //o->Set(NanNew("full"), NanNew(filter.isFull)); + //o->Set(NanNew("empty"), NanNew(filter.isEmpty)); + //o->Set(NanNew("hashFuncs"), NanNew(filter.nHashFuncs)); + //o->Set(NanNew("tweaks"), NanNew(filter.nTweak)); + //o->Set(NanNew("flags"), NanNew(filter.nFlags)); } +#if 0 } else if (strCommand == "filteradd") { vector vData; *cur->vRecv >> vData;