Use 'type_name' structure field instead of 'typename', which is

a C++ reserved work.

Add a ng_copy_meta() function.

1 files changed, 21 insertions, 1 deletions

diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index a9b2783..c47273a 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -1436,7 +1436,7 @@ ng_generic_msg(node_p here, struct ng_mesg *msg, const char *retaddr,
 				    __FUNCTION__, "types");
 				break;
 			}
-			strncpy(tp->typename, type->name, NG_TYPELEN);
+			strncpy(tp->type_name, type->name, NG_TYPELEN);
 			tp->numnodes = type->refs;
 			tl->numtypes++;
 		}
@@ -1676,6 +1676,26 @@ ng_send_dataq(hook_p hook, struct mbuf *m, meta_p meta,
 	return (error);
 }
 
+/*
+ * Copy a 'meta'.
+ *
+ * Returns new meta, or NULL if original meta is NULL or ENOMEM.
+ */
+meta_p
+ng_copy_meta(meta_p meta)
+{
+	meta_p meta2;
+
+	if (meta == NULL)
+		return (NULL);
+	MALLOC(meta2, meta_p, meta->used_len, M_NETGRAPH, M_NOWAIT);
+	if (meta2 == NULL)
+		return (NULL);
+	meta2->allocated_len = meta->used_len;
+	bcopy(meta, meta2, meta->used_len);
+	return (meta2);
+}
+
 /************************************************************************
 			Module routines
 ************************************************************************/