ukamnya
/
network-manager-wireguard
forked from mirror/network-manager-wireguard-upstream
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Continue transition

master
Max Moser 2018-02-12 16:06:08 +01:00
parent 0287e14285
commit c12e861ccf
11 changed files with 58 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -42,7 +42,7 @@ appdata/network-manager-wireguard.metainfo.xml
*/tests/*.trs */tests/*.trs
test-*.log test-*.log
auth-dialog/nm-openvpn-auth-dialog auth-dialog/nm-wireguard-auth-dialog
nm-wireguard-service.name nm-wireguard-service.name
nm-openvpn.desktop nm-openvpn.desktop
src/nm-wireguard-service src/nm-wireguard-service

96
Makefile.am
View File

@ -48,7 +48,7 @@ src_cppflags = \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DLOCALSTATEDIR=\""$(localstatedir)"\" \ -DLOCALSTATEDIR=\""$(localstatedir)"\" \
-DDATADIR=\"$(datadir)\" \ -DDATADIR=\"$(datadir)\" \
-DNM_OPENVPN_LOCALEDIR=\"$(datadir)/locale\" \ -DNM_WIREGUARD_LOCALEDIR=\"$(datadir)/locale\" \
-DG_LOG_DOMAIN=\"nm-wireguard\" \ -DG_LOG_DOMAIN=\"nm-wireguard\" \
-I$(srcdir)/shared \ -I$(srcdir)/shared \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
@ -102,14 +102,14 @@ EXTRA_DIST += \
properties/gresource.xml properties/gresource.xml
plugin_sources = \ plugin_sources = \
properties/nm-openvpn-editor-plugin.c \ properties/nm-wireguard-editor-plugin.c \
properties/nm-openvpn-editor-plugin.h properties/nm-wireguard-editor-plugin.h
editor_sources = \ editor_sources = \
properties/resources.c \ properties/resources.c \
properties/resources.h \ properties/resources.h \
properties/nm-openvpn-editor.c \ properties/nm-wireguard-editor.c \
properties/nm-openvpn-editor.h \ properties/nm-wireguard-editor.h \
properties/auth-helpers.c \ properties/auth-helpers.c \
properties/auth-helpers.h properties/auth-helpers.h
@ -121,88 +121,88 @@ properties_cppflags = \
############################################################################### ###############################################################################
noinst_LTLIBRARIES += properties/libnm-vpn-plugin-openvpn-utils.la noinst_LTLIBRARIES += properties/libnm-vpn-plugin-wireguard-utils.la
properties_libnm_vpn_plugin_openvpn_utils_la_SOURCES = \ properties_libnm_vpn_plugin_wireguard_utils_la_SOURCES = \
$(shared_sources) $(shared_sources)
properties_libnm_vpn_plugin_openvpn_utils_la_CPPFLAGS = \ properties_libnm_vpn_plugin_wireguard_utils_la_CPPFLAGS = \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
-DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \ -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
$(properties_cppflags) \ $(properties_cppflags) \
$(LIBNM_CFLAGS) $(LIBNM_CFLAGS)
properties_libnm_vpn_plugin_openvpn_utils_la_LIBADD = \ properties_libnm_vpn_plugin_wireguard_utils_la_LIBADD = \
$(LIBNM_LIBS) \ $(LIBNM_LIBS) \
$(DL_LIBS) $(DL_LIBS)
noinst_LTLIBRARIES += properties/libnm-vpn-plugin-openvpn-core.la noinst_LTLIBRARIES += properties/libnm-vpn-plugin-wireguard-core.la
properties_libnm_vpn_plugin_openvpn_core_la_SOURCES = \ properties_libnm_vpn_plugin_wireguard_core_la_SOURCES = \
shared/nm-utils/nm-vpn-plugin-utils.c \ shared/nm-utils/nm-vpn-plugin-utils.c \
shared/nm-utils/nm-vpn-plugin-utils.h \ shared/nm-utils/nm-vpn-plugin-utils.h \
shared/nm-utils/nm-vpn-plugin-macros.h \ shared/nm-utils/nm-vpn-plugin-macros.h \
$(plugin_sources) $(plugin_sources)
properties_libnm_vpn_plugin_openvpn_core_la_CPPFLAGS = \ properties_libnm_vpn_plugin_wireguard_core_la_CPPFLAGS = \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
-DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \ -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
$(properties_cppflags) \ $(properties_cppflags) \
$(LIBNM_CFLAGS) $(LIBNM_CFLAGS)
properties_libnm_vpn_plugin_openvpn_core_la_LIBADD = \ properties_libnm_vpn_plugin_wireguard_core_la_LIBADD = \
properties/libnm-vpn-plugin-openvpn-utils.la \ properties/libnm-vpn-plugin-wireguard-utils.la \
$(LIBNM_LIBS) \ $(LIBNM_LIBS) \
$(DL_LIBS) $(DL_LIBS)
plugin_LTLIBRARIES += properties/libnm-vpn-plugin-openvpn.la plugin_LTLIBRARIES += properties/libnm-vpn-plugin-wireguard.la
properties_libnm_vpn_plugin_openvpn_la_SOURCES = properties_libnm_vpn_plugin_wireguard_la_SOURCES =
properties_libnm_vpn_plugin_openvpn_la_LIBADD = \ properties_libnm_vpn_plugin_wireguard_la_LIBADD = \
properties/libnm-vpn-plugin-openvpn-core.la properties/libnm-vpn-plugin-wireguard-core.la
properties_libnm_vpn_plugin_openvpn_la_LDFLAGS = \ properties_libnm_vpn_plugin_wireguard_la_LDFLAGS = \
-avoid-version \ -avoid-version \
-Wl,--version-script=$(srcdir)/properties/libnm-vpn-plugin-openvpn.ver -Wl,--version-script=$(srcdir)/properties/libnm-vpn-plugin-wireguard.ver
############################################################################### ###############################################################################
if WITH_GNOME if WITH_GNOME
plugin_LTLIBRARIES += properties/libnm-vpn-plugin-openvpn-editor.la plugin_LTLIBRARIES += properties/libnm-vpn-plugin-wireguard-editor.la
endif endif
properties_libnm_vpn_plugin_openvpn_editor_la_SOURCES = \ properties_libnm_vpn_plugin_wireguard_editor_la_SOURCES = \
$(editor_sources) $(editor_sources)
properties_libnm_vpn_plugin_openvpn_editor_la_CPPFLAGS = \ properties_libnm_vpn_plugin_wireguard_editor_la_CPPFLAGS = \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR \
$(properties_cppflags) \ $(properties_cppflags) \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
$(LIBNM_CFLAGS) \ $(LIBNM_CFLAGS) \
$(LIBNMA_CFLAGS) $(LIBNMA_CFLAGS)
properties_libnm_vpn_plugin_openvpn_editor_la_LIBADD = \ properties_libnm_vpn_plugin_wireguard_editor_la_LIBADD = \
properties/libnm-vpn-plugin-openvpn-utils.la \ properties/libnm-vpn-plugin-wireguard-utils.la \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(LIBNM_LIBS) \ $(LIBNM_LIBS) \
$(LIBNMA_LIBS) $(LIBNMA_LIBS)
properties_libnm_vpn_plugin_openvpn_editor_la_LDFLAGS = \ properties_libnm_vpn_plugin_wireguard_editor_la_LDFLAGS = \
-avoid-version \ -avoid-version \
-Wl,--version-script=$(srcdir)/properties/libnm-vpn-plugin-openvpn-editor.ver -Wl,--version-script=$(srcdir)/properties/libnm-vpn-plugin-wireguard-editor.ver
############################################################################### ###############################################################################
if WITH_LIBNM_GLIB if WITH_LIBNM_GLIB
noinst_LTLIBRARIES += properties/libnm-openvpn-properties-core.la noinst_LTLIBRARIES += properties/libnm-wireguard-properties-core.la
endif endif
properties_libnm_openvpn_properties_core_la_SOURCES = \ properties_libnm_wireguard_properties_core_la_SOURCES = \
$(shared_sources) \ $(shared_sources) \
$(plugin_sources) \ $(plugin_sources) \
$(editor_sources) $(editor_sources)
properties_libnm_openvpn_properties_core_la_CPPFLAGS = \ properties_libnm_wireguard_properties_core_la_CPPFLAGS = \
-DNM_VPN_OLD \ -DNM_VPN_OLD \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
$(properties_cppflags) \ $(properties_cppflags) \
@ -210,7 +210,7 @@ properties_libnm_openvpn_properties_core_la_CPPFLAGS = \
$(LIBNM_GLIB_CFLAGS) \ $(LIBNM_GLIB_CFLAGS) \
$(LIBNM_GTK_CFLAGS) $(LIBNM_GTK_CFLAGS)
properties_libnm_openvpn_properties_core_la_LIBADD = \ properties_libnm_wireguard_properties_core_la_LIBADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(LIBNM_GLIB_LIBS) \ $(LIBNM_GLIB_LIBS) \
@ -218,20 +218,20 @@ properties_libnm_openvpn_properties_core_la_LIBADD = \
if WITH_LIBNM_GLIB if WITH_LIBNM_GLIB
plugin_LTLIBRARIES += properties/libnm-openvpn-properties.la plugin_LTLIBRARIES += properties/libnm-wireguard-properties.la
endif endif
properties_libnm_openvpn_properties_la_SOURCES = properties_libnm_wireguard_properties_la_SOURCES =
properties_libnm_openvpn_properties_la_LIBADD = \ properties_libnm_wireguard_properties_la_LIBADD = \
properties/libnm-openvpn-properties-core.la properties/libnm-wireguard-properties-core.la
properties_libnm_openvpn_properties_la_LDFLAGS = \ properties_libnm_wireguard_properties_la_LDFLAGS = \
-avoid-version \ -avoid-version \
-Wl,--version-script=$(srcdir)/properties/libnm-openvpn-properties.ver -Wl,--version-script=$(srcdir)/properties/libnm-wireguard-properties.ver
EXTRA_DIST += \ EXTRA_DIST += \
properties/libnm-vpn-plugin-openvpn.ver \ properties/libnm-vpn-plugin-wireguard.ver \
properties/libnm-vpn-plugin-openvpn-editor.ver \ properties/libnm-vpn-plugin-wireguard-editor.ver \
properties/libnm-openvpn-properties.ver \ properties/libnm-wireguard-properties.ver \
properties/nm-wireguard-dialog.ui properties/nm-wireguard-dialog.ui
############################################################################### ###############################################################################
@ -255,7 +255,7 @@ properties_tests_test_import_export_CPPFLAGS = \
$(LIBNMA_CFLAGS) $(LIBNMA_CFLAGS)
properties_tests_test_import_export_LDADD = \ properties_tests_test_import_export_LDADD = \
properties/libnm-vpn-plugin-openvpn-core.la \ properties/libnm-vpn-plugin-wireguard-core.la \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(LIBNM_LIBS) \ $(LIBNM_LIBS) \
$(LIBNMA_LIBS) $(LIBNMA_LIBS)
@ -276,7 +276,7 @@ properties_tests_test_import_export_glib_CPPFLAGS = \
$(LIBNM_GTK_CFLAGS) $(LIBNM_GTK_CFLAGS)
properties_tests_test_import_export_glib_LDADD = \ properties_tests_test_import_export_glib_LDADD = \
properties/libnm-openvpn-properties-core.la \ properties/libnm-wireguard-properties-core.la \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(LIBNM_GLIB_LIBS) \ $(LIBNM_GLIB_LIBS) \
@ -316,13 +316,13 @@ EXTRA_DIST += \
############################################################################### ###############################################################################
if WITH_GNOME if WITH_GNOME
libexec_PROGRAMS += auth-dialog/nm-openvpn-auth-dialog libexec_PROGRAMS += auth-dialog/nm-wireguard-auth-dialog
endif endif
auth_dialog_nm_openvpn_auth_dialog_SOURCES = \ auth_dialog_nm_wireguard_auth_dialog_SOURCES = \
$(shared_sources) \ $(shared_sources) \
auth-dialog/main.c auth-dialog/main.c
auth_dialog_nm_openvpn_auth_dialog_CPPFLAGS = \ auth_dialog_nm_wireguard_auth_dialog_CPPFLAGS = \
-DICONDIR=\""$(datadir)/pixmaps"\" \ -DICONDIR=\""$(datadir)/pixmaps"\" \
-DBINDIR=\""$(bindir)"\" \ -DBINDIR=\""$(bindir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
@ -332,15 +332,15 @@ auth_dialog_nm_openvpn_auth_dialog_CPPFLAGS = \
$(LIBNM_CFLAGS) \ $(LIBNM_CFLAGS) \
$(LIBNMA_CFLAGS) \ $(LIBNMA_CFLAGS) \
$(LIBSECRET_CFLAGS) $(LIBSECRET_CFLAGS)
auth_dialog_nm_openvpn_auth_dialog_LDFLAGS = \ auth_dialog_nm_wireguard_auth_dialog_LDFLAGS = \
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" -Wl,--version-script="$(srcdir)/linker-script-binary.ver"
auth_dialog_nm_openvpn_auth_dialog_LDADD = \ auth_dialog_nm_wireguard_auth_dialog_LDADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(LIBNM_LIBS) \ $(LIBNM_LIBS) \
$(LIBNMA_LIBS) \ $(LIBNMA_LIBS) \
$(LIBSECRET_LIBS) $(LIBSECRET_LIBS)
EXTRA_auth_dialog_nm_openvpn_auth_dialog_DEPENDENCIES = \ EXTRA_auth_dialog_nm_wireguard_auth_dialog_DEPENDENCIES = \
linker-script-binary.ver linker-script-binary.ver
############################################################################### ###############################################################################

0
properties/libnm-vpn-plugin-openvpn-editor.ver → properties/libnm-vpn-plugin-wireguard-editor.ver
View File

0
properties/libnm-vpn-plugin-openvpn.ver → properties/libnm-vpn-plugin-wireguard.ver
View File

0
properties/libnm-openvpn-properties.ver → properties/libnm-wireguard-properties.ver
View File

6
properties/nm-openvpn-editor-plugin.c → properties/nm-wireguard-editor-plugin.c
View File

@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/*************************************************************************** /***************************************************************************
* nm-openvpn-editor-plugin.c : GNOME UI dialogs for configuring openvpn VPN connections * nm-wireguard-editor-plugin.c : GNOME UI dialogs for configuring wireguard VPN connections
* *
* Copyright (C) 2005 Tim Niemueller <tim@niemueller.de> * Copyright (C) 2005 Tim Niemueller <tim@niemueller.de>
* Copyright (C) 2008 - 2010 Dan Williams, <dcbw@redhat.com> * Copyright (C) 2008 - 2010 Dan Williams, <dcbw@redhat.com>
@ -25,7 +25,7 @@
#include "nm-default.h" #include "nm-default.h"
#include "nm-openvpn-editor-plugin.h" #include "nm-wireguard-editor-plugin.h"
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
@ -34,7 +34,7 @@
#include <string.h> #include <string.h>
#ifdef NM_VPN_OLD #ifdef NM_VPN_OLD
#include "nm-openvpn-editor.h" #include "nm-wireguard-editor.h"
#else #else
#include "nm-utils/nm-vpn-plugin-utils.h" #include "nm-utils/nm-vpn-plugin-utils.h"
#endif #endif

2
properties/nm-openvpn-editor-plugin.h → properties/nm-wireguard-editor-plugin.h
View File

@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/*************************************************************************** /***************************************************************************
* nm-openvpn-editor.h : GNOME UI dialogs for configuring openvpn VPN connections * nm-wireguard-editor.h : GNOME UI dialogs for configuring wireguard VPN connections
* *
* Copyright (C) 2008 Dan Williams, <dcbw@redhat.com> * Copyright (C) 2008 Dan Williams, <dcbw@redhat.com>
* *

4
properties/nm-openvpn-editor.c → properties/nm-wireguard-editor.c
View File

@ -27,7 +27,7 @@
#include "nm-default.h" #include "nm-default.h"
#include "nm-openvpn-editor.h" #include "nm-wireguard-editor.h"
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
@ -978,7 +978,7 @@ openvpn_editor_plugin_widget_class_init (OpenvpnEditorClass *req_class)
#ifndef NM_VPN_OLD #ifndef NM_VPN_OLD
#include "nm-openvpn-editor-plugin.h" #include "nm-wireguard-editor-plugin.h"
G_MODULE_EXPORT NMVpnEditor * G_MODULE_EXPORT NMVpnEditor *
nm_vpn_editor_factory_openvpn (NMVpnEditorPlugin *editor_plugin, nm_vpn_editor_factory_openvpn (NMVpnEditorPlugin *editor_plugin,

2
properties/nm-openvpn-editor.h → properties/nm-wireguard-editor.h
View File

@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/*************************************************************************** /***************************************************************************
* nm-openvpn-editor.h : GNOME UI dialogs for configuring openvpn VPN connections * nm-wireguard-editor.h : GNOME UI dialogs for configuring wireguard VPN connections
* *
* Copyright (C) 2008 Dan Williams, <dcbw@redhat.com> * Copyright (C) 2008 Dan Williams, <dcbw@redhat.com>
* *

4
properties/tests/test-import-export.c
View File

@ -26,8 +26,8 @@
#include <locale.h> #include <locale.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "nm-openvpn-editor-plugin.h" #include "nm-wireguard-editor-plugin.h"
#include "nm-openvpn-editor.h" #include "nm-wireguard-editor.h"
#include "import-export.h" #include "import-export.h"
#include "utils.h" #include "utils.h"

3
src/nm-wireguard-service.c
View File

@ -62,9 +62,6 @@
#ifndef LIBEXECDIR #ifndef LIBEXECDIR
#define LIBEXECDIR "" #define LIBEXECDIR ""
#endif #endif
#ifndef NM_OPENVPN_LOCALEDIR
#define NM_OPENVPN_LOCALEDIR ""
#endif
#ifndef NM_WIREGUARD_LOCALEDIR #ifndef NM_WIREGUARD_LOCALEDIR
#define NM_WIREGUARD_LOCALEDIR "" #define NM_WIREGUARD_LOCALEDIR ""
#endif #endif