Skip to content

Commit

Permalink
Added openconnect_set_localname()
Browse files Browse the repository at this point in the history
This provides an API to advertise our desired hostname to the server.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
nmav authored and David Woodhouse committed Mar 8, 2016
1 parent 9da02cb commit 98a882f
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 0 deletions.
1 change: 1 addition & 0 deletions java/src/org/infradead/libopenconnect/LibOpenConnect.java
Expand Up @@ -120,6 +120,7 @@ public boolean isCanceled() {
public synchronized native void setXMLSHA1(String hash);
public synchronized native void setHostname(String hostname);
public synchronized native void setUrlpath(String urlpath);
public synchronized native void setLocalName(String localName);
public synchronized native void setCAFile(String caFile);
public synchronized native void setReportedOS(String os);
public synchronized native void setMobileInfo(String mobilePlatformVersion,
Expand Down
8 changes: 8 additions & 0 deletions jni.c
Expand Up @@ -1182,6 +1182,14 @@ JNIEXPORT void JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setUrlpa
SET_STRING_END();
}

JNIEXPORT void JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setLocalName(
JNIEnv *jenv, jobject jobj, jstring jarg)
{
SET_STRING_START()
openconnect_set_localname(ctx->vpninfo, arg);
SET_STRING_END();
}

JNIEXPORT void JNICALL Java_org_infradead_libopenconnect_LibOpenConnect_setCAFile(
JNIEnv *jenv, jobject jobj, jstring jarg)
{
Expand Down
1 change: 1 addition & 0 deletions libopenconnect.map.in
Expand Up @@ -79,6 +79,7 @@ OPENCONNECT_5_3 {
openconnect_get_cstp_compression;
openconnect_get_dtls_compression;
openconnect_disable_ipv6;
openconnect_set_localname;
} OPENCONNECT_5_2;

OPENCONNECT_PRIVATE {
Expand Down
9 changes: 9 additions & 0 deletions library.c
Expand Up @@ -403,6 +403,15 @@ int openconnect_set_urlpath(struct openconnect_info *vpninfo,
return 0;
}

int openconnect_set_localname(struct openconnect_info *vpninfo,
const char *localname)
{
UTF8CHECK(localname);

STRDUP(vpninfo->localname, localname);
return 0;
}

void openconnect_set_xmlsha1(struct openconnect_info *vpninfo,
const char *xmlsha1, int size)
{
Expand Down
2 changes: 2 additions & 0 deletions openconnect.h
Expand Up @@ -33,6 +33,7 @@

/*
* API version 5.3:
* - Add openconnect_set_localname().
* - Add openconnect_override_getaddrinfo().
* - Add openconnect_get_cstp_compression().
* - Add openconnect_get_dtls_compression().
Expand Down Expand Up @@ -382,6 +383,7 @@ const char *openconnect_get_hostname(struct openconnect_info *);
int openconnect_set_hostname(struct openconnect_info *, const char *);
char *openconnect_get_urlpath(struct openconnect_info *);
int openconnect_set_urlpath(struct openconnect_info *, const char *);
int openconnect_set_localname(struct openconnect_info *, const char *);

/* Some software tokens, such as HOTP tokens, include a counter which
* needs to be stored in persistent storage.
Expand Down

0 comments on commit 98a882f

Please sign in to comment.