Skip to content

Nodejs14 Support #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rnbwdsh wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Nodejs14 Support #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41efa19
support node v10
matoro Mar 15, 2019
7d04247
Add nodejs12+14 compatibility, make indentations consistent
rnbwdsh May 17, 2020
f1dadfa
Add nodejs12+14 compatibility, make indentations consistent
rnbwdsh May 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ "name" : "iptrie"
, "description" : "IP tries (prefix tree)"
, "keywords" : [ "iptrie", "blocklist", "IP", "acl" ]
, "version" : "0.0.7"
, "version" : "0.0.8"
, "author" : { "name" : "Theo Schlossnagle" }
, "directories": { "lib": "." }
, "repository" :
Expand Down
66 changes: 39 additions & 27 deletions src/iptrie.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#include <v8.h>
#include <node.h>
#include <node_object_wrap.h>
#include <assert.h>

using namespace v8;
using namespace node;
Expand All @@ -44,22 +43,27 @@ class IPTrie : public ObjectWrap {
public:
static Persistent<FunctionTemplate> s_ct;
static void
Initialize(v8::Handle<v8::Object> target) {
Initialize(v8::Local<v8::Object> target) {
Isolate *isolate = target->GetIsolate();
HandleScope scope(isolate);

Local<FunctionTemplate> t = FunctionTemplate::New(isolate, New);
Local<String> name = CheckedString(isolate, "IPTrie");
s_ct.Reset(isolate, t);
t->InstanceTemplate()->SetInternalFieldCount(3);
t->SetClassName(String::NewFromUtf8(isolate, "IPTrie", String::kInternalizedString));
t->SetClassName(name);

NODE_SET_PROTOTYPE_METHOD(t, "add", Add);
NODE_SET_PROTOTYPE_METHOD(t, "del", Del);
NODE_SET_PROTOTYPE_METHOD(t, "find", Find);


target->Set(String::NewFromUtf8(isolate, "IPTrie", String::kInternalizedString),
t->GetFunction());
target->Set(isolate->GetCurrentContext(), name, t->GetFunction(isolate->GetCurrentContext()).ToLocalChecked())
#ifdef NODE_VERSION_AT_LEAST(14, 0, 0)
.ToChecked();
#else
.Check();
#endif
}

struct obj_baton_t {
Expand All @@ -80,7 +84,7 @@ class IPTrie : public ObjectWrap {
drop_tree(&tree6, delete_baton);
}

int Add(const char *ip, int prefix, Handle<Value> dv) {
int Add(const char *ip, int prefix, Local<Value> dv) {
int family, rv;
union {
struct in_addr addr4;
Expand Down Expand Up @@ -154,60 +158,68 @@ class IPTrie : public ObjectWrap {
args.GetReturnValue().Set(args.This());
}

static Local <String> CheckedString(Isolate *isolate, const char *str) {
return String::NewFromUtf8(isolate, "IPTrie", v8::NewStringType::kNormal)
#ifdef NODE_VERSION_AT_LEAST(14, 0, 0)
.ToLocalChecked()
#endif
;
}

static void Add(const FunctionCallbackInfo<Value> &args) {
Isolate *isolate = args.GetIsolate();
HandleScope scope(isolate);

if (args.Length() < 1 || !args[0]->IsString()) {
isolate->ThrowException(
Exception::TypeError(
String::NewFromUtf8(isolate, "First argument must be an IP.")));
Exception::TypeError(
CheckedString(isolate, "First argument must be an IP.")));
return;
}
if (args.Length() < 2 || !args[1]->IsNumber()){
if (args.Length() < 2 || !args[1]->IsNumber()) {
isolate->ThrowException(
Exception::TypeError(
String::NewFromUtf8(isolate, "Second argument must be a prefix length")));
CheckedString(isolate, "Second argument must be a prefix length")));
return;
}
if (args.Length() < 3) {
isolate->ThrowException(
Exception::TypeError(
String::NewFromUtf8(isolate, "Third argument must exist")));
CheckedString(isolate, "Third argument must exist")));
return;
}

String::Utf8Value ipaddress(args[0]->ToString());
int prefix_len = args[1]->ToUint32()->Value();
String::Utf8Value ipaddress(isolate, args[0]->ToString(isolate->GetCurrentContext()).ToLocalChecked());
int prefix_len = args[1]->Uint32Value(isolate->GetCurrentContext()).ToChecked();

IPTrie *iptrie = ObjectWrap::Unwrap<IPTrie>(args.This());
Handle<Value> data = args[2];
if(iptrie->Add(*ipaddress, prefix_len, data) == 0) {
Local<Value>data = args[2];
if (iptrie->Add(*ipaddress, prefix_len, data) == 0) {
isolate->ThrowException(
Exception::TypeError(
String::NewFromUtf8(isolate, "Could not parse IP")));
CheckedString(isolate, "Could not parse IP")));
return;
}
}

static void Del(const FunctionCallbackInfo<Value> &args) {
static void Del(const FunctionCallbackInfo <Value> &args) {
Isolate *isolate = args.GetIsolate();

if (args.Length() < 1 || !args[0]->IsString()) {
isolate->ThrowException(
Exception::TypeError(
String::NewFromUtf8(isolate, "First argument must be an IP.")));
CheckedString(isolate, "First argument must be an IP.")));
return;
}
if (args.Length() < 2 || !args[1]->IsNumber()){
isolate->ThrowException(
Exception::TypeError(
String::NewFromUtf8(isolate, "Second argument must be a prefix length")));
Exception::TypeError(
CheckedString(isolate, "Second argument must be a prefix length")));
return;
}

String::Utf8Value ipaddress(args[0]->ToString());
int prefix_len = args[1]->ToUint32()->Value();
String::Utf8Value ipaddress(isolate, args[0]->ToString(isolate->GetCurrentContext()).ToLocalChecked());
int prefix_len = args[1]->Uint32Value(isolate->GetCurrentContext()).ToChecked();

IPTrie *iptrie = ObjectWrap::Unwrap<IPTrie>(args.This());
int success = iptrie->Del(*ipaddress, prefix_len);
Expand All @@ -220,17 +232,17 @@ class IPTrie : public ObjectWrap {

if (args.Length() < 1 || !args[0]->IsString()) {
isolate->ThrowException(
Exception::TypeError(
String::NewFromUtf8(isolate, "Required argument: ip address.")));
Exception::TypeError(
CheckedString(isolate, "Required argument: ip address.")));
return;
}

String::Utf8Value ipaddress(args[0]->ToString());
String::Utf8Value ipaddress(isolate, args[0]->ToString(isolate->GetCurrentContext()).ToLocalChecked());

IPTrie *iptrie = ObjectWrap::Unwrap<IPTrie>(args.This());
obj_baton_t *d = iptrie->Find(*ipaddress);
if(d != NULL) {
args.GetReturnValue().Set(d->val);
args.GetReturnValue().Set(d->val.Get(isolate));
}
}

Expand All @@ -242,7 +254,7 @@ class IPTrie : public ObjectWrap {
Persistent<FunctionTemplate> IPTrie::s_ct;

extern "C" {
static void init(Handle<Object> target) {
static void init(Local<Object> target) {
IPTrie::Initialize(target);
}
NODE_MODULE(iptrie, init);
Expand Down