d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
a C++ reserved work.

Add a ng_copy_meta() function.
This commit is contained in:
Archie Cobbs 2000-05-01 23:29:19 +00:00
parent 98516badc6
commit a096e45ab9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=59879
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/netgraph/netgraph.h
View File

@ -256,6 +256,7 @@ int ng_bypass(hook_p hook1, hook_p hook2);
void ng_cutlinks(node_p node);
int ng_con_nodes(node_p node,
const char *name, node_p node2, const char *name2);
meta_p ng_copy_meta(meta_p meta);
void ng_destroy_hook(hook_p hook);
hook_p ng_findhook(node_p node, const char *name);
node_p ng_findname(node_p node, const char *name);

22
sys/netgraph/ng_base.c
View File

@ -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
************************************************************************/

2
sys/netgraph/ng_message.h
View File

@ -243,7 +243,7 @@ struct namelist {
/* Structure used for NGM_LISTTYPES */
struct typeinfo {
char typename[NG_TYPELEN + 1]; /* name of type */
char type_name[NG_TYPELEN + 1]; /* name of type */
u_int32_t numnodes; /* number alive */
};