libknet: create onwire.h to contain/define all packet(s) data/info

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
kronosnet · Dec 14, 2012 · e6af66f · e6af66f
1 parent 54a055d
commit e6af66f
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 72 deletions.
diff --git a/libknet/Makefile.am b/libknet/Makefile.am
@@ -30,7 +30,8 @@ pkgconfig_DATA		= libknet.pc
 
 noinst_HEADERS		= internals.h \
 			  crypto.h \
-			  nsscrypto.h
+			  nsscrypto.h \
+			  onwire.h
 
 lib_LTLIBRARIES		= libknet.la
 

diff --git a/libknet/handle.c b/libknet/handle.c
@@ -17,6 +17,7 @@
 #include <sys/epoll.h>
 
 #include "internals.h"
+#include "onwire.h"
 #include "crypto.h"
 
 #define KNET_MAX_EVENTS 8

diff --git a/libknet/libknet.h b/libknet/libknet.h
@@ -80,77 +80,6 @@ struct knet_host {
 	struct knet_host *next;
 };
 
-#define KNET_HOST_INFO_LINK_UP_DOWN 0
-#define KNET_HOST_INFO_LINK_TABLE   1
-
-struct knet_hinfo_link {
-	uint8_t			khl_link_id;
-	uint8_t			khl_link_dynamic;
-	uint8_t			khl_link_priority;
-	uint64_t		khl_link_latency;
-	char			khl_link_dst_ipaddr[KNET_MAX_HOST_LEN];
-	char			khl_link_dst_port[KNET_MAX_PORT_LEN];
-} __attribute__((packed));
-
-struct knet_hinfo_link_table {
-	uint16_t		khlt_node_id;
-	uint8_t			khlt_local; /* we have this node connected locally */
-	struct knet_hinfo_link	khlt_link[KNET_MAX_LINK]; /* info we send about each link in the node */
-} __attribute__((packed));
-
-union knet_hinfo_dtype {
-	struct {
-		uint8_t		khdt_link_id;
-		uint8_t		khdt_link_status;
-	} link_up_down;
-	struct {
-		uint16_t	khdt_host_entries;
-		uint8_t		khdt_host_maps[0]; /* array of knet_hinfo_link_table[khdt_host_entries] */
-	} link_table __attribute__((packed));
-} __attribute__((packed));
-
-struct knet_hinfo_data {			/* this is sent in kf_data */
-	uint8_t			khd_type;	/* link_up_down / link_table */
-	uint8_t			khd_bcast;	/* bcast/ucast */
-	uint16_t		khd_dst_node_id;/* used only if in ucast mode */
-	union knet_hinfo_dtype  khd_dype;
-} __attribute__((packed));
-
-union knet_frame_data {
-	struct {
-		seq_num_t	kfd_seq_num;
-		uint8_t		kfd_data[0];
-	} data __attribute__((packed));
-	struct {
-		uint8_t		kfd_link;
-		uint8_t		kfd_dyn;
-		uint32_t	kfd_time[4];
-	} ping __attribute__((packed));
-} __attribute__((packed));
-
-struct knet_frame {
-	uint8_t			kf_version;
-	uint8_t			kf_type;
-	uint16_t		kf_node;
-	union knet_frame_data	kf_payload;
-} __attribute__((packed));
-
-#define kf_seq_num kf_payload.data.kfd_seq_num
-#define kf_data kf_payload.data.kfd_data
-#define kf_link kf_payload.ping.kfd_link
-#define kf_time kf_payload.ping.kfd_time
-#define kf_dyn kf_payload.ping.kfd_dyn
-
-#define KNET_FRAME_SIZE (sizeof(struct knet_frame) - sizeof(union knet_frame_data))
-
-#define KNET_FRAME_VERSION 0x01
-
-#define KNET_FRAME_DATA      0x00
-#define KNET_FRAME_HOST_INFO 0x01
-#define KNET_FRAME_PING      0x81
-#define KNET_FRAME_PONG      0x82
-#define KNET_FRAME_PMSK      0x80 /* ping/pong packet mask */
-
 #define KNET_MIN_KEY_LEN 1024
 #define KNET_MAX_KEY_LEN 4096
 

diff --git a/libknet/onwire.h b/libknet/onwire.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2010-2012 Red Hat, Inc.  All rights reserved.
+ *
+ * Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
+ *          Federico Simoncelli <fsimon@kronosnet.org>
+ *
+ * This software licensed under GPL-2.0+, LGPL-2.0+
+ */
+
+#ifndef __ONWIRE_H__
+#define __ONWIRE_H__
+
+#include <stdint.h>
+#include <netinet/in.h>
+
+#define KNET_HOST_INFO_LINK_UP_DOWN 0
+#define KNET_HOST_INFO_LINK_TABLE   1
+
+struct knet_hinfo_link {
+	uint8_t			khl_link_id;
+	uint8_t			khl_link_dynamic;
+	uint8_t			khl_link_priority;
+	uint64_t		khl_link_latency;
+	char			khl_link_dst_ipaddr[KNET_MAX_HOST_LEN];
+	char			khl_link_dst_port[KNET_MAX_PORT_LEN];
+} __attribute__((packed));
+
+struct knet_hinfo_link_table {
+	uint16_t		khlt_node_id;
+	uint8_t			khlt_local; /* we have this node connected locally */
+	struct knet_hinfo_link	khlt_link[KNET_MAX_LINK]; /* info we send about each link in the node */
+} __attribute__((packed));
+
+union knet_hinfo_dtype {
+	struct {
+		uint8_t		khdt_link_id;
+		uint8_t		khdt_link_status;
+	} link_up_down;
+	struct {
+		uint16_t	khdt_host_entries;
+		uint8_t		khdt_host_maps[0]; /* array of knet_hinfo_link_table[khdt_host_entries] */
+	} link_table __attribute__((packed));
+} __attribute__((packed));
+
+struct knet_hinfo_data {			/* this is sent in kf_data */
+	uint8_t			khd_type;	/* link_up_down / link_table */
+	uint8_t			khd_bcast;	/* bcast/ucast */
+	uint16_t		khd_dst_node_id;/* used only if in ucast mode */
+	union knet_hinfo_dtype  khd_dype;
+} __attribute__((packed));
+
+union knet_frame_data {
+	struct {
+		seq_num_t	kfd_seq_num;
+		uint8_t		kfd_data[0];
+	} data __attribute__((packed));
+	struct {
+		uint8_t		kfd_link;
+		uint8_t		kfd_dyn;
+		uint32_t	kfd_time[4];
+	} ping __attribute__((packed));
+} __attribute__((packed));
+
+struct knet_frame {
+	uint8_t			kf_version;
+	uint8_t			kf_type;
+	uint16_t		kf_node;
+	union knet_frame_data	kf_payload;
+} __attribute__((packed));
+
+#define kf_seq_num kf_payload.data.kfd_seq_num
+#define kf_data kf_payload.data.kfd_data
+#define kf_link kf_payload.ping.kfd_link
+#define kf_time kf_payload.ping.kfd_time
+#define kf_dyn kf_payload.ping.kfd_dyn
+
+#define KNET_FRAME_SIZE (sizeof(struct knet_frame) - sizeof(union knet_frame_data))
+
+#define KNET_FRAME_VERSION 0x01
+
+#define KNET_FRAME_DATA      0x00
+#define KNET_FRAME_HOST_INFO 0x01
+#define KNET_FRAME_PING      0x81
+#define KNET_FRAME_PONG      0x82
+#define KNET_FRAME_PMSK      0x80 /* ping/pong packet mask */
+
+#endif