Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
jni: Sync jni.c and LibOpenConnect.java
Remove unused setupFD() jni stub.  Add missing setPFS() Java declaration.
Add missing setReqMTU() jni stub.  Remove unnecessary "!!" on jboolean.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
  • Loading branch information
cernekee committed Jun 10, 2014
1 parent ff214c6 commit 7d87891
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions java/src/org/infradead/libopenconnect/LibOpenConnect.java
Expand Up @@ -126,6 +126,7 @@ public synchronized native void setMobileInfo(String mobilePlatformVersion,
public synchronized native void setClientCert(String cert, String sslKey);
public synchronized native void setServerCertSHA1(String hash);
public synchronized native void setReqMTU(int mtu);
public synchronized native void setPFS(int isEnabled);

/* connection info */

Expand Down
20 changes: 10 additions & 10 deletions jni.c
Expand Up @@ -877,34 +877,34 @@ JNIEXPORT void JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setCertE
openconnect_set_cert_expiry_warning(ctx->vpninfo, arg);
}

JNIEXPORT void JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setPFS(
JNIEXPORT void JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setReqMTU(
JNIEnv *jenv, jobject jobj, jint arg)
{
struct libctx *ctx = getctx(jenv, jobj);

if (!ctx)
return;
openconnect_set_pfs(ctx->vpninfo, arg);
openconnect_set_reqmtu(ctx->vpninfo, arg);
}

JNIEXPORT jint JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_makeCSTPConnection(
JNIEnv *jenv, jobject jobj)
JNIEXPORT void JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setPFS(
JNIEnv *jenv, jobject jobj, jint arg)
{
struct libctx *ctx = getctx(jenv, jobj);

if (!ctx)
return -EINVAL;
return openconnect_make_cstp_connection(ctx->vpninfo);
return;
openconnect_set_pfs(ctx->vpninfo, arg);
}

JNIEXPORT jint JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setupFD(
JNIEnv *jenv, jobject jobj, jint arg)
JNIEXPORT jint JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_makeCSTPConnection(
JNIEnv *jenv, jobject jobj)
{
struct libctx *ctx = getctx(jenv, jobj);

if (!ctx)
return -EINVAL;
return openconnect_setup_tun_fd(ctx->vpninfo, arg);
return openconnect_make_cstp_connection(ctx->vpninfo);
}

JNIEXPORT jint JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setupDTLS(
Expand Down Expand Up @@ -957,7 +957,7 @@ JNIEXPORT void JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setXMLPo

if (!ctx)
return;
openconnect_set_xmlpost(ctx->vpninfo, !!arg);
openconnect_set_xmlpost(ctx->vpninfo, arg);
}

/* simple cases: return a const string (no need to free it) */
Expand Down

0 comments on commit 7d87891

Please sign in to comment.