From abe3588e56850403f7ebaf3c9090552e5f4830c6 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Mon, 19 Sep 2022 16:19:01 +0200 Subject: Exports: Simplify building - Remove subdir c - Do not compile c code as a separate shared library - Move all definitions/declarations into the preamble as they shouldn't be shared anyways. So no headers are needed - Define the callback as static, needed so we don't get a duplicate declaration --- exports/disco.go | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) (limited to 'exports/disco.go') diff --git a/exports/disco.go b/exports/disco.go index a08f8ba..bd5a663 100644 --- a/exports/disco.go +++ b/exports/disco.go @@ -1,9 +1,40 @@ package main /* -// for free +// for free and size_t #include -#include "c/disco.h" + +typedef struct discoveryServer { + const char* authentication_url_template; + const char* base_url; + const char* country_code; + const char* display_name; + const char* keyword_list; + const char** public_key_list; + size_t total_public_keys; + const char* server_type; + const char** support_contact; + size_t total_support_contact; +} discoveryServer; + +typedef struct discoveryServers { + unsigned long long int version; + discoveryServer** servers; + size_t total_servers; +} discoveryServers; + +typedef struct discoveryOrganization { + const char* display_name; + const char* org_id; + const char* secure_internet_home; + const char* keyword_list; +} discoveryOrganization; + +typedef struct discoveryOrganizations { + unsigned long long int version; + discoveryOrganization** organizations; + size_t total_organizations; +} discoveryOrganizations; */ import "C" -- cgit v1.2.3