Merge branch 'periodic_Trojan_touch_up'

https://gitlab.com/openconnect/openconnect/-/merge_requests/79

java/src/org/infradead/libopenconnect/LibOpenConnect.java

@@ -127,6 +127,7 @@ public boolean isCanceled() {
 	public synchronized native int passphraseFromFSID();
 	public synchronized native void setCertExpiryWarning(int seconds);
 	public synchronized native void setDPD(int minSeconds);
+	public synchronized native void setTrojanInterval(int seconds);
 	public synchronized native int setProxyAuth(String methods);
 	public synchronized native int setHTTPProxy(String proxy);
 	public synchronized native void setXMLSHA1(String hash);

jni.c

@@ -1041,6 +1041,16 @@ JNIEXPORT void JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setDPD(
 	openconnect_set_dpd(ctx->vpninfo, arg);
 }
 
+JNIEXPORT void JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setTrojanInterval(
+	JNIEnv *jenv, jobject jobj, jint arg)
+{
+	struct libctx *ctx = getctx(jenv, jobj);
+
+	if (!ctx)
+		return;
+	openconnect_set_trojan_interval(ctx->vpninfo, arg);
+}
+
 JNIEXPORT void JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setPFS(
 	JNIEnv *jenv, jobject jobj, jboolean arg)
 {

library.c

@@ -132,7 +132,7 @@ static const struct vpn_proto openconnect_protos[] = {
 		.name = "nc",
 		.pretty_name = N_("Juniper Network Connect"),
 		.description = N_("Compatible with Juniper Network Connect"),
-		.flags = OC_PROTO_PROXY | OC_PROTO_CSD | OC_PROTO_AUTH_CERT | OC_PROTO_AUTH_OTP,
+		.flags = OC_PROTO_PROXY | OC_PROTO_CSD | OC_PROTO_AUTH_CERT | OC_PROTO_AUTH_OTP | OC_PROTO_PERIODIC_TROJAN,
 		.vpn_close_session = oncp_bye,
 		.tcp_connect = oncp_connect,
 		.tcp_mainloop = oncp_mainloop,
@@ -151,7 +151,7 @@ static const struct vpn_proto openconnect_protos[] = {
 		.name = "gp",
 		.pretty_name = N_("Palo Alto Networks GlobalProtect"),
 		.description = N_("Compatible with Palo Alto Networks (PAN) GlobalProtect SSL VPN"),
-		.flags = OC_PROTO_PROXY | OC_PROTO_CSD | OC_PROTO_AUTH_CERT | OC_PROTO_AUTH_OTP | OC_PROTO_AUTH_STOKEN,
+		.flags = OC_PROTO_PROXY | OC_PROTO_CSD | OC_PROTO_AUTH_CERT | OC_PROTO_AUTH_OTP | OC_PROTO_AUTH_STOKEN | OC_PROTO_PERIODIC_TROJAN,
 		.vpn_close_session = gpst_bye,
 		.tcp_connect = gpst_setup,
 		.tcp_mainloop = gpst_mainloop,

openconnect.h

@@ -185,6 +185,7 @@ extern "C" {
 #define OC_PROTO_AUTH_CERT	(1<<2)
 #define OC_PROTO_AUTH_OTP	(1<<3)
 #define OC_PROTO_AUTH_STOKEN	(1<<4)
+#define OC_PROTO_PERIODIC_TROJAN	(1<<4)
 
 struct oc_vpn_proto {
 	const char *name;
@@ -437,7 +438,7 @@ int openconnect_init_ssl(void);
 const char *openconnect_get_cstp_cipher(struct openconnect_info *);
 const char *openconnect_get_dtls_cipher(struct openconnect_info *);
 
-/* These return a descriptive string of the compression algorithm 
+/* These return a descriptive string of the compression algorithm
  * in use (LZS, LZ4, ...). If no compression then NULL is returned. */
 const char *openconnect_get_cstp_compression(struct openconnect_info *);
 const char *openconnect_get_dtls_compression(struct openconnect_info *);