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

MFC rev. 1.26-1.27

Browse Source 
Remove one very strange unneded if.
Fix memory leak when export hook is not connected.
This commit is contained in:
mav 2008-01-28 19:46:17 +00:00
parent 03b41d2cc2
commit d5e0acaf5b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netgraph/netflow/netflow.c
View File

@ -618,6 +618,8 @@ export_send(priv_p priv, item_p item, int flags)
if (priv->export != NULL)
/* Should also NET_LOCK_GIANT(). */
NG_FWD_ITEM_HOOK_FLAGS(error, item, priv->export, flags);
else
NG_FREE_ITEM(item);
return (error);
}
@ -632,13 +634,8 @@ export_add(item_p item, struct flow_entry *fle)
struct netflow_v5_header *header = &dgram->header;
struct netflow_v5_record *rec;
if (header->count == 0 ) { /* first record */
rec = &dgram->r[0];
header->count = 1;
} else { /* continue filling datagram */
rec = &dgram->r[header->count];
header->count ++;
}
rec = &dgram->r[header->count];
header->count ++;
KASSERT(header->count <= NETFLOW_V5_MAX_RECORDS,
("ng_netflow: export too big"));