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

Change the type of 'etlv' field in struct named_object to uint16_t.

Browse Source 
It should match with the type field in struct ipfw_obj_tlv.

Obtained from:	Yandex LLC
Sponsored by:	Yandex LLC
This commit is contained in:
Andrey V. Elsukov 2016-04-14 21:52:31 +00:00
parent a6e0c5da99
commit 4bd916567e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/netpfil/ipfw/ip_fw_private.h
View File

@ -313,9 +313,9 @@ struct named_object {
TAILQ_ENTRY(named_object) nn_next; /* namehash */ TAILQ_ENTRY(named_object) nn_next; /* namehash */
TAILQ_ENTRY(named_object) nv_next; /* valuehash */ TAILQ_ENTRY(named_object) nv_next; /* valuehash */
char *name; /* object name */ char *name; /* object name */
uint8_t subtype; /* object subtype within class */ uint16_t etlv; /* Export TLV id */
uint8_t etlv; /* Export TLV id */ uint8_t subtype;/* object subtype within class */
uint16_t spare[2]; uint8_t spare[3];
uint16_t kidx; /* object kernel index */ uint16_t kidx; /* object kernel index */
uint32_t set; /* set object belongs to */ uint32_t set; /* set object belongs to */
uint32_t refcnt; /* number of references */ uint32_t refcnt; /* number of references */

3
sys/netpfil/ipfw/ip_fw_sockopt.c
View File

@ -4063,7 +4063,8 @@ ipfw_objhash_lookup_name_type(struct namedobj_instance *ni, uint32_t set,
hash = ni->hash_f(ni, name, set) % ni->nn_size; hash = ni->hash_f(ni, name, set) % ni->nn_size;
TAILQ_FOREACH(no, &ni->names[hash], nn_next) { TAILQ_FOREACH(no, &ni->names[hash], nn_next) {
if (ni->cmp_f(no, name, set) == 0 && no->etlv == type) if (ni->cmp_f(no, name, set) == 0 &&
no->etlv == (uint16_t)type)
return (no); return (no);
} }