summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2017-03-03 14:40:29 +0100
committerSander Vrijders <sander.vrijders@ugent.be>2017-03-03 14:40:29 +0100
commite2616e184f023da7ce535efb5a676715283c092c (patch)
tree2a36110cedcaf53933c455a7be00b3f515fcbd82
parentb1b59cc4642faa99514f2288ba1bb5324a79850f (diff)
downloadouroboros-e2616e184f023da7ce535efb5a676715283c092c.tar.gz
ouroboros-e2616e184f023da7ce535efb5a676715283c092c.zip
ipcpd: normal: Deprecate CDAP flow
This removes the CDAP flow class, which is no longer needed.
-rw-r--r--src/ipcpd/normal/CMakeLists.txt1
-rw-r--r--src/ipcpd/normal/cdap_flow.c186
-rw-r--r--src/ipcpd/normal/cdap_flow.h46
3 files changed, 0 insertions, 233 deletions
diff --git a/src/ipcpd/normal/CMakeLists.txt b/src/ipcpd/normal/CMakeLists.txt
index 772d5212..6319c3ef 100644
--- a/src/ipcpd/normal/CMakeLists.txt
+++ b/src/ipcpd/normal/CMakeLists.txt
@@ -19,7 +19,6 @@ protobuf_generate_c(FLOW_ALLOC_SRCS FLOW_ALLOC_HDRS flow_alloc.proto)
set(SOURCE_FILES
# Add source files here
addr_auth.c
- cdap_flow.c
connmgr.c
dir.c
enroll.c
diff --git a/src/ipcpd/normal/cdap_flow.c b/src/ipcpd/normal/cdap_flow.c
deleted file mode 100644
index c694e637..00000000
--- a/src/ipcpd/normal/cdap_flow.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * Normal IPC Process - Authenticated CDAP Flow Allocator
- *
- * Sander Vrijders <sander.vrijders@ugent.be>
- * Dimitri Staessens <dimitri.staessens@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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#define OUROBOROS_PREFIX "cdap-flow"
-
-#include <ouroboros/config.h>
-#include <ouroboros/dev.h>
-#include <ouroboros/logs.h>
-
-#include "cdap_flow.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-static void cdap_flow_destroy(struct cdap_flow * flow)
-{
- assert(flow);
-
- if (flow->ci != NULL)
- cdap_destroy(flow->ci);
-
- free(flow);
-}
-
-struct cdap_flow * cdap_flow_arr(int fd,
- int resp,
- const struct conn_info * info)
-{
- struct cdap_flow * flow;
-
- if (flow_alloc_resp(fd, resp) < 0) {
- log_err("Could not respond to new flow.");
- return NULL;
- }
-
- if (resp)
- return NULL;
-
- flow = malloc(sizeof(*flow));
- if (flow == NULL) {
- log_err("Failed to malloc.");
- return NULL;
- }
-
- memset(&flow->info, 0, sizeof(flow->info));
-
- flow->fd = fd;
- flow->ci = NULL;
-
- if (cacep_rcv(fd, &flow->info)) {
- log_err("Error establishing application connection.");
- cdap_flow_destroy(flow);
- return NULL;
- }
-
- if (cacep_snd(fd, info)) {
- log_err("Failed to respond to application connection request.");
- cdap_flow_destroy(flow);
- return NULL;
- }
-
- if (strcmp(flow->info.ae_name, info->ae_name)) {
- log_err("Received connection for wrong AE.");
- cdap_flow_destroy(flow);
- return NULL;
- }
-
- if (strcmp(flow->info.protocol, info->protocol) ||
- flow->info.pref_version != info->pref_version ||
- flow->info.pref_syntax != info->pref_syntax) {
- log_err("Unknown protocol.");
- cdap_flow_destroy(flow);
- return NULL;
- }
-
- flow->ci = cdap_create(fd);
- if (flow->ci == NULL) {
- log_err("Failed to create CDAP instance.");
- cdap_flow_destroy(flow);
- return NULL;
- }
-
- return flow;
-}
-
-struct cdap_flow * cdap_flow_alloc(const char * dst_name,
- qosspec_t * qs,
- const struct conn_info * info)
-{
- struct cdap_flow * flow;
- int fd;
-
- log_dbg("Allocating flow to %s.", dst_name);
-
- if (dst_name == NULL) {
- log_err("Not enough info to establish flow.");
- return NULL;
- }
-
- fd = flow_alloc(dst_name, qs);
- if (fd < 0) {
- log_err("Failed to allocate flow to %s.", dst_name);
- return NULL;
- }
-
- if (flow_alloc_res(fd)) {
- log_err("Flow allocation to %s failed.", dst_name);
- return NULL;
- }
-
- flow = malloc(sizeof(*flow));
- if (flow == NULL) {
- log_err("Failed to malloc.");
- flow_dealloc(fd);
- return NULL;
- }
-
- memset(&flow->info, 0, sizeof(flow->info));
-
- flow->fd = fd;
- flow->ci = NULL;
-
- if (cacep_snd(fd, info)) {
- log_err("Failed to send connection request.");
- cdap_flow_dealloc(flow);
- return NULL;
- }
-
- if (cacep_rcv(fd, &flow->info)) {
- log_err("Failed to connect to application.");
- cdap_flow_dealloc(flow);
- return NULL;
- }
-
- if (strcmp(flow->info.ae_name, info->ae_name)) {
- log_err("Received connection for wrong AE.");
- cdap_flow_destroy(flow);
- return NULL;
- }
-
- if (strcmp(flow->info.protocol, info->protocol) ||
- flow->info.pref_version != info->pref_version ||
- flow->info.pref_syntax != info->pref_syntax) {
- log_err("Unknown protocol.");
- cdap_flow_destroy(flow);
- return NULL;
- }
-
- flow->ci = cdap_create(fd);
- if (flow->ci == NULL) {
- log_err("Failed to create CDAP instance.");
- cdap_flow_dealloc(flow);
- return NULL;
- }
-
- return flow;
-}
-
-void cdap_flow_dealloc(struct cdap_flow * flow)
-{
- int fd = flow->fd;
-
- cdap_flow_destroy(flow);
-
- flow_dealloc(fd);
-}
diff --git a/src/ipcpd/normal/cdap_flow.h b/src/ipcpd/normal/cdap_flow.h
deleted file mode 100644
index 761f3463..00000000
--- a/src/ipcpd/normal/cdap_flow.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * Normal IPC Process - Authenticated CDAP Flow Allocator
- *
- * Sander Vrijders <sander.vrijders@ugent.be>
- * Dimitri Staessens <dimitri.staessens@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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef OUROBOROS_IPCPD_NORMAL_CDAP_FLOW_H
-#define OUROBOROS_IPCPD_NORMAL_CDAP_FLOW_H
-
-#include <ouroboros/cacep.h>
-#include <ouroboros/cdap.h>
-#include <ouroboros/qos.h>
-
-struct cdap_flow {
- int fd;
- struct cdap * ci;
- struct conn_info info;
-};
-
-struct cdap_flow * cdap_flow_arr(int fd,
- int resp,
- const struct conn_info * info);
-
-struct cdap_flow * cdap_flow_alloc(const char * dst_name,
- qosspec_t * qs,
- const struct conn_info * info);
-
-void cdap_flow_dealloc(struct cdap_flow * flow);
-
-#endif /* OUROBOROS_IPCPD_NORMAL_CDAP_FLOW_H */