void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Adam Ierymenko 2017-01-13 12:13:20 -08:00
commit f8e18f2098
3 changed files with 44 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
java/jni/Android.mk
View file

@ -35,9 +35,9 @@ LOCAL_SRC_FILES := \
$(ZT1)/node/Switch.cpp \
$(ZT1)/node/Tag.cpp \
$(ZT1)/node/Topology.cpp \
$(ZT1)/node/Utils.cpp \
$(ZT1)/osdep/Http.cpp \
$(ZT1)/osdep/OSUtils.cpp
$(ZT1)/node/Utils.cpp
# $(ZT1)/osdep/Http.cpp \
# $(ZT1)/osdep/OSUtils.cpp
# JNI Files
LOCAL_SRC_FILES += \

2
java/jni/ZT_jniutils.cpp
View file

@ -154,6 +154,8 @@ jobject createEvent(JNIEnv *env, ZT_Event event)
case ZT_EVENT_TRACE:
fieldName = "EVENT_TRACE";
break;
case ZT_EVENT_USER_MESSAGE:
break;
}
jfieldID enumField = lookup.findStaticField(eventClass, fieldName.c_str(), "Lcom/zerotier/sdk/Event;");

2
java/jni/com_zerotierone_sdk_Node.cpp
View file

@ -291,6 +291,8 @@ namespace {
}
}
break;
case ZT_EVENT_USER_MESSAGE:
break;
}
}