diff options
-rw-r--r-- | curvetun.c | 4 | ||||
-rw-r--r-- | curvetun/Makefile | 8 | ||||
-rw-r--r-- | curvetun_client.c (renamed from ct_client.c) | 4 | ||||
-rw-r--r-- | curvetun_mgmt_servers.c (renamed from ct_servmgmt.c) | 2 | ||||
-rw-r--r-- | curvetun_mgmt_servers.h (renamed from ct_servmgmt.h) | 0 | ||||
-rw-r--r-- | curvetun_mgmt_users.c (renamed from ct_usermgmt.c) | 2 | ||||
-rw-r--r-- | curvetun_mgmt_users.h (renamed from ct_usermgmt.h) | 0 | ||||
-rw-r--r-- | curvetun_server.c (renamed from ct_server.c) | 2 |
8 files changed, 11 insertions, 11 deletions
@@ -35,8 +35,8 @@ #include "curvetun.h" #include "curve.h" #include "config.h" -#include "ct_usermgmt.h" -#include "ct_servmgmt.h" +#include "curvetun_mgmt_users.h" +#include "curvetun_mgmt_servers.h" #include "ioops.h" #include "tprintf.h" #include "crypto.h" diff --git a/curvetun/Makefile b/curvetun/Makefile index 5882683..4f28adf 100644 --- a/curvetun/Makefile +++ b/curvetun/Makefile @@ -22,8 +22,8 @@ curvetun-objs = xmalloc.o \ ioexact.o \ ioops.o \ cpusched.o \ - ct_usermgmt.o \ - ct_servmgmt.o \ - ct_server.o \ - ct_client.o \ + curvetun_mgmt_servers.o \ + curvetun_mgmt_users.o \ + curvetun_server.o \ + curvetun_client.o \ curvetun.o diff --git a/ct_client.c b/curvetun_client.c index 37b6090..e102db0 100644 --- a/ct_client.c +++ b/curvetun_client.c @@ -35,8 +35,8 @@ #include "corking.h" #include "ioexact.h" #include "curvetun.h" -#include "ct_servmgmt.h" -#include "ct_usermgmt.h" +#include "curvetun_mgmt_servers.h" +#include "curvetun_mgmt_users.h" #include "crypto_auth_hmacsha512256.h" extern volatile sig_atomic_t sigint; diff --git a/ct_servmgmt.c b/curvetun_mgmt_servers.c index f069ab9..ee6d732 100644 --- a/ct_servmgmt.c +++ b/curvetun_mgmt_servers.c @@ -18,8 +18,8 @@ #include "xmalloc.h" #include "curvetun.h" #include "curve.h" +#include "curvetun_mgmt_servers.h" #include "crypto.h" -#include "ct_servmgmt.h" struct server_store { int udp; diff --git a/ct_servmgmt.h b/curvetun_mgmt_servers.h index 9c5cd84..9c5cd84 100644 --- a/ct_servmgmt.h +++ b/curvetun_mgmt_servers.h diff --git a/ct_usermgmt.c b/curvetun_mgmt_users.c index c303cd5..665ceb3 100644 --- a/ct_usermgmt.c +++ b/curvetun_mgmt_users.c @@ -15,7 +15,6 @@ #include <arpa/inet.h> #include "die.h" -#include "ct_usermgmt.h" #include "locking.h" #include "xmalloc.h" #include "ioexact.h" @@ -24,6 +23,7 @@ #include "curvetun.h" #include "curve.h" #include "crypto.h" +#include "curvetun_mgmt_users.h" #include "hash.h" struct user_store { diff --git a/ct_usermgmt.h b/curvetun_mgmt_users.h index ff9d601..ff9d601 100644 --- a/ct_usermgmt.h +++ b/curvetun_mgmt_users.h diff --git a/ct_server.c b/curvetun_server.c index 9737ffd..bb704b0 100644 --- a/ct_server.c +++ b/curvetun_server.c @@ -39,7 +39,7 @@ #include "cpus.h" #include "sock.h" #include "built_in.h" -#include "ct_usermgmt.h" +#include "curvetun_mgmt_users.h" #include "cpusched.h" #include "trie.h" |