diff options
Diffstat (limited to 'src/ipcpd/normal')
| -rw-r--r-- | src/ipcpd/normal/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/ipcpd/normal/enroll.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/normal/enroll.proto | 39 | 
3 files changed, 2 insertions, 43 deletions
| diff --git a/src/ipcpd/normal/CMakeLists.txt b/src/ipcpd/normal/CMakeLists.txt index e7e230d2..2446dc00 100644 --- a/src/ipcpd/normal/CMakeLists.txt +++ b/src/ipcpd/normal/CMakeLists.txt @@ -14,8 +14,6 @@ include_directories(${CMAKE_BINARY_DIR}/include)  set(IPCP_NORMAL_TARGET ipcpd-normal CACHE INTERNAL "") -protobuf_generate_c(ENROLL_PROTO_SRCS ENROLL_PROTO_HDRS enroll.proto -  ${CMAKE_SOURCE_DIR}/src/lib/ipcp_config.proto)  protobuf_generate_c(KAD_PROTO_SRCS KAD_PROTO_HDRS kademlia.proto)  math(EXPR PFT_EXPR "1 << 12") @@ -55,7 +53,7 @@ set(SOURCE_FILES    )  add_executable(ipcpd-normal ${SOURCE_FILES} ${IPCP_SOURCES} -  ${KAD_PROTO_SRCS} ${ENROLL_PROTO_SRCS}) +  ${KAD_PROTO_SRCS} ${LAYER_CONFIG_PROTO_SRCS})  target_link_libraries(ipcpd-normal LINK_PUBLIC ouroboros-dev)  include(AddCompileFlags) diff --git a/src/ipcpd/normal/enroll.c b/src/ipcpd/normal/enroll.c index eaa87a42..a321db2b 100644 --- a/src/ipcpd/normal/enroll.c +++ b/src/ipcpd/normal/enroll.c @@ -41,7 +41,7 @@  #include <string.h>  #include <pthread.h> -#include "enroll.pb-c.h" +#include "ipcp_config.pb-c.h"  typedef EnrollMsg enroll_msg_t;  #define ENROLL_COMP             "Enrollment" diff --git a/src/ipcpd/normal/enroll.proto b/src/ipcpd/normal/enroll.proto deleted file mode 100644 index f0c9ef7c..00000000 --- a/src/ipcpd/normal/enroll.proto +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Ouroboros - Copyright (C) 2016 - 2018 - * - * Enrollment message - * - *    Dimitri Staessens <dimitri.staessens@ugent.be> - *    Sander Vrijders   <sander.vrijders@ugent.be> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., http://www.fsf.org/about/contact/. - */ - -syntax = "proto2"; - -import "ipcp_config.proto"; - -enum enroll_code { -        ENROLL_REQ  = 1; -        ENROLL_BOOT = 2; -        ENROLL_DONE = 4; -}; - -message enroll_msg { -        required enroll_code     code   = 1; -        optional ipcp_config_msg conf   = 2; -        optional int64           t_sec  = 3; -        optional uint32          t_nsec = 4; -        optional int32           result = 5; -};
\ No newline at end of file | 
