trafgen: proto: Split static protocol definition out of struct proto_hdr

Currently struct proto_hdr is used twofold:

  1) Statically define protocol behavior, i.e. all the *_hdr definitions in
     trafgen_l{2,3,4}.c which map a protocol id/layer to a set of callback
     functions.

  2) For each packet created at parse time the struct is memcpy()'ed
     (including all the static information from 1) and then used to store
     dynamic information at parse/run time.

Thus, struct proto_hdr members such as the proto id, layer and the
pointers callback functions get copied for each created packet (in
addition to the other fields which get changed during parsing). Also,
static/dynamic information get mixed and we e.g. can't make the protocol
definitions const to ensure they'll not get changed by mistake.

Rather than copying the struct proto_hdr for every packet, clearly
separate the two purposes defined above by splitting struct proto_hdr
into two structs:

  1) struct proto_ops for the static (const) protocol behavior definition

  2) struct proto_hdr (reduced) for dynamic information

struct proto_hdr keeps a pointer to the corresponding proto_ops instance
and uses it to execute the corresponding callbacks.

Reference: https://groups.google.com/forum/#!msg/netsniff-ng/20RvwJdh50Y/eMkbmKSaBgAJ
Acked-by: Vadim Kochan <vadim4j@gmail.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

1 files changed, 21 insertions, 19 deletions

diff --git a/trafgen_proto.h b/trafgen_proto.h
index dbba700..9716aa2 100644
--- a/trafgen_proto.h
+++ b/trafgen_proto.h
@@ -29,6 +29,25 @@ enum proto_layer {
 
 struct proto_hdr;
 
+struct proto_ops {
+	enum proto_id id;
+	enum proto_layer layer;
+
+	void (*header_init)(struct proto_hdr *hdr);
+	void (*header_finish)(struct proto_hdr *hdr);
+	void (*packet_finish)(struct proto_hdr *hdr);
+	void (*set_next_proto)(struct proto_hdr *hdr, enum proto_id pid);
+};
+
+struct proto_hdr {
+	const struct proto_ops *ops;
+	uint16_t pkt_offset;
+	uint32_t pkt_id;
+	struct proto_field *fields;
+	size_t fields_count;
+	size_t len;
+};
+
 struct proto_field {
 	uint32_t id;
 	size_t len;
@@ -42,27 +61,10 @@ struct proto_field {
 	struct proto_hdr *hdr;
 };
 
-struct proto_hdr {
-	enum proto_id id;
-	enum proto_layer layer;
-
-	struct proto_hdr *next;
-	uint16_t pkt_offset;
-	uint32_t pkt_id;
-	struct proto_field *fields;
-	size_t fields_count;
-	size_t len;
-
-	void (*header_init)(struct proto_hdr *hdr);
-	void (*header_finish)(struct proto_hdr *hdr);
-	void (*packet_finish)(struct proto_hdr *hdr);
-	void (*set_next_proto)(struct proto_hdr *hdr, enum proto_id pid);
-};
-
 extern void protos_init(const char *dev);
-extern void proto_header_register(struct proto_hdr *hdr);
+extern void proto_ops_register(const struct proto_ops *ops);
 
-extern struct proto_hdr *proto_header_init(enum proto_id pid);
+extern struct proto_hdr *proto_header_push(enum proto_id pid);
 extern void proto_header_finish(struct proto_hdr *hdr);
 extern void proto_packet_finish(void);
 extern struct proto_hdr *proto_lower_default_add(struct proto_hdr *hdr,