summaryrefslogtreecommitdiff
path: root/src/ipcpd/shim-data.h
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2026-08-16 18:55:15 +0000
committerSander Vrijders <sander@ouroboros.rocks>2026-08-31 08:31:45 +0200
commit5c239c128c04883dbed6d66f574edf8b48d11e11 (patch)
tree6dfcc043c81bd10e1366172b9db5cf5ce93bb8d8 /src/ipcpd/shim-data.h
parenta830ed966eb3b7d6dbcc43e42a7b6b7c5d796c6a (diff)
downloadouroboros-5c239c128c04883dbed6d66f574edf8b48d11e11.tar.gz
ouroboros-5c239c128c04883dbed6d66f574edf8b48d11e11.zip
lib: Replace shim IPCPs with points of attachment
Removes the UDP and Ethernet shim IPCPs. The unicast and broadcast IPCPs can now directly attach to a "legacy" socket. We adopt Saltzer's Point-of-Attachment terminology, also advocated in Day's "Patterns in Network Architecture". The "poa" component manages these PoA's with one management thread, one link monitoring thread and one thread per attached point. For Ethernet PoA's the irm connect and enroll can resolve the destination IPCP or Layer name with a broadcast name query over the attached PoAs (first reply wins). UDP PoA's require a destination IP address or FQDN. attach to a local endpoint (required both server and client side): irm ipcp poa attach name a udp 10.0.0.1 irm ipcp poa attach name a udp 10.0.0.1:3435 irm ipcp poa attach name a udp [::1]:3435 irm ipcp poa attach name a eth dev eth0 irm ipcp poa attach name a eth dev eth0 ethertype 0xA000 release a PoA (refused while it carries a flow): irm ipcp poa detach name a udp 10.0.0.1:3435 irm ipcp poa detach name a eth eth0 list an IPCP's PoAs: irm ipcp poa list name a connect to a peer, by name or at an address: irm ipcp connect name b dst a irm ipcp connect name b dst a eth irm ipcp connect name b dst a eth dev eth0 irm ipcp connect name b dst a udp 10.0.0.1:3435 irm ipcp connect name b dst a udp peer.example.com:3435 disconnect by peer name, no address: irm ipcp disconnect name b dst a irm ipcp disconnect name b dst a component mgmt enroll has the same shape as connect: irm ipcp enroll name b layer lr autobind irm ipcp enroll name b layer lr autobind eth dev eth0 irm ipcp enroll name b layer lr autobind udp 10.0.0.1:3435 the IRMd config file attaches PoAs and names peers the same way: udp = [ "10.0.0.1", "10.0.0.1:3436" ] eth = [ "eth0", {dev="eth1", ethertype=0xA007} ] enrol={dst="LAN", eth={dev="eth0"}} conn=[{dst="lan3", eth={}}, {dst="lan4", udp="10.0.0.1:3435"}] Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks> Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'src/ipcpd/shim-data.h')
-rw-r--r--src/ipcpd/shim-data.h109
1 files changed, 0 insertions, 109 deletions
diff --git a/src/ipcpd/shim-data.h b/src/ipcpd/shim-data.h
deleted file mode 100644
index fbadb4d4..00000000
--- a/src/ipcpd/shim-data.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2026
- *
- * Utitilies for building IPC processes
- *
- * Dimitri Staessens <dimitri@ouroboros.rocks>
- * Sander Vrijders <sander@ouroboros.rocks>
- *
- * 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/.
- */
-
-#ifndef OUROBOROS_IPCPD_IPCP_DATA_H
-#define OUROBOROS_IPCPD_IPCP_DATA_H
-
-#include <ouroboros/list.h>
-
-#include <pthread.h>
-#include <stdint.h>
-#include <netinet/in.h>
-#include <sys/types.h>
-
-#define MAC_SIZE 6
-
-enum dir_query_state {
- QUERY_INIT = 0,
- QUERY_PENDING,
- QUERY_RESPONSE,
- QUERY_DONE,
- QUERY_DESTROY
-};
-
-struct dir_query {
- struct list_head next;
- uint8_t * hash;
- enum dir_query_state state;
-
- pthread_mutex_t lock;
- pthread_cond_t cond;
-};
-
-struct addr {
- union {
- uint8_t mac[MAC_SIZE];
- struct in_addr ip4;
- struct in6_addr ip6;
- };
-};
-
-struct shim_data {
- struct list_head registry;
- pthread_rwlock_t reg_lock;
-
- struct list_head directory;
- pthread_rwlock_t dir_lock;
-
- struct list_head dir_queries;
- pthread_mutex_t dir_queries_lock;
-};
-
-struct shim_data * shim_data_create(void);
-
-void shim_data_destroy(struct shim_data * data);
-
-int shim_data_reg_add_entry(struct shim_data * data,
- const uint8_t * hash);
-
-int shim_data_reg_del_entry(struct shim_data * data,
- const uint8_t * hash);
-
-bool shim_data_reg_has(struct shim_data * data,
- const uint8_t * hash);
-
-int shim_data_dir_add_entry(struct shim_data * data,
- const uint8_t * hash,
- struct addr addr);
-
-int shim_data_dir_del_entry(struct shim_data * data,
- const uint8_t * hash,
- struct addr addr);
-
-bool shim_data_dir_has(struct shim_data * data,
- const uint8_t * hash);
-
-struct addr shim_data_dir_get_addr(struct shim_data * data,
- const uint8_t * hash);
-
-struct dir_query * shim_data_dir_query_create(struct shim_data * data,
- const uint8_t * hash);
-
-void shim_data_dir_query_destroy(struct shim_data * data,
- struct dir_query * query);
-
-void shim_data_dir_query_respond(struct shim_data * data,
- const uint8_t * hash);
-
-int shim_data_dir_query_wait(struct dir_query * query,
- const struct timespec * timeout);
-#endif /* OUROBOROS_IPCPD_SHIM_DATA_H */