diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2011-05-19 07:54:53 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2011-05-19 07:54:53 -0700 |
commit | 5c3816f2ff3d40136da1e40eec792d8faf0e75dd (patch) | |
tree | a1d92dd6bb6e5f0487beae8f3dffcdd8526d1d09 /core/jni/android_net_NetUtils.cpp | |
parent | c6b7a0131e92a0bdeb268cee185404ceae9b54b7 (diff) | |
parent | c41aefe1d4c862a9fbaf717ffb886bbd702c94f2 (diff) | |
download | frameworks_base-5c3816f2ff3d40136da1e40eec792d8faf0e75dd.zip frameworks_base-5c3816f2ff3d40136da1e40eec792d8faf0e75dd.tar.gz frameworks_base-5c3816f2ff3d40136da1e40eec792d8faf0e75dd.tar.bz2 |
Merge c41aefe1
Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b
Diffstat (limited to 'core/jni/android_net_NetUtils.cpp')
-rw-r--r-- | core/jni/android_net_NetUtils.cpp | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp index 548376d..ddae505 100644 --- a/core/jni/android_net_NetUtils.cpp +++ b/core/jni/android_net_NetUtils.cpp @@ -26,10 +26,6 @@ extern "C" { int ifc_enable(const char *ifname); int ifc_disable(const char *ifname); -int ifc_add_route(const char *ifname, const char *destStr, uint32_t prefixLen, const char *gwStr); -int ifc_remove_host_routes(const char *ifname); -int ifc_get_default_route(const char *ifname); -int ifc_remove_default_route(const char *ifname); int ifc_reset_connections(const char *ifname); int dhcp_do_request(const char *ifname, @@ -94,56 +90,6 @@ static jint android_net_utils_disableInterface(JNIEnv* env, jobject clazz, jstri return (jint)result; } -static jint android_net_utils_addRoute(JNIEnv* env, jobject clazz, jstring ifname, - jstring dst, jint prefixLength, jstring gw) -{ - int result; - - const char *nameStr = env->GetStringUTFChars(ifname, NULL); - const char *dstStr = env->GetStringUTFChars(dst, NULL); - const char *gwStr = NULL; - if (gw != NULL) { - gwStr = env->GetStringUTFChars(gw, NULL); - } - result = ::ifc_add_route(nameStr, dstStr, prefixLength, gwStr); - env->ReleaseStringUTFChars(ifname, nameStr); - env->ReleaseStringUTFChars(dst, dstStr); - if (gw != NULL) { - env->ReleaseStringUTFChars(gw, gwStr); - } - return (jint)result; -} - -static jint android_net_utils_removeHostRoutes(JNIEnv* env, jobject clazz, jstring ifname) -{ - int result; - - const char *nameStr = env->GetStringUTFChars(ifname, NULL); - result = ::ifc_remove_host_routes(nameStr); - env->ReleaseStringUTFChars(ifname, nameStr); - return (jint)result; -} - -static jint android_net_utils_getDefaultRoute(JNIEnv* env, jobject clazz, jstring ifname) -{ - int result; - - const char *nameStr = env->GetStringUTFChars(ifname, NULL); - result = ::ifc_get_default_route(nameStr); - env->ReleaseStringUTFChars(ifname, nameStr); - return (jint)result; -} - -static jint android_net_utils_removeDefaultRoute(JNIEnv* env, jobject clazz, jstring ifname) -{ - int result; - - const char *nameStr = env->GetStringUTFChars(ifname, NULL); - result = ::ifc_remove_default_route(nameStr); - env->ReleaseStringUTFChars(ifname, nameStr); - return (jint)result; -} - static jint android_net_utils_resetConnections(JNIEnv* env, jobject clazz, jstring ifname) { int result; @@ -260,12 +206,6 @@ static JNINativeMethod gNetworkUtilMethods[] = { { "enableInterface", "(Ljava/lang/String;)I", (void *)android_net_utils_enableInterface }, { "disableInterface", "(Ljava/lang/String;)I", (void *)android_net_utils_disableInterface }, - { "addRoute", "(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)I", - (void *)android_net_utils_addRoute }, - { "removeHostRoutes", "(Ljava/lang/String;)I", (void *)android_net_utils_removeHostRoutes }, - { "getDefaultRouteNative", "(Ljava/lang/String;)I", - (void *)android_net_utils_getDefaultRoute }, - { "removeDefaultRoute", "(Ljava/lang/String;)I", (void *)android_net_utils_removeDefaultRoute }, { "resetConnections", "(Ljava/lang/String;)I", (void *)android_net_utils_resetConnections }, { "runDhcp", "(Ljava/lang/String;Landroid/net/DhcpInfoInternal;)Z", (void *)android_net_utils_runDhcp }, { "runDhcpRenew", "(Ljava/lang/String;Landroid/net/DhcpInfoInternal;)Z", (void *)android_net_utils_runDhcpRenew }, |