mirror of
https://git.rtems.org/rtems-libbsd/
synced 2025-10-18 04:27:47 +08:00
Update to FreeBSD head 2018-02-01
Git mirror commit d079ae0442af8fa3cfd6d7ede190d04e64a2c0d4. Update #3472.
This commit is contained in:
@@ -502,10 +502,7 @@ print_attr_string(netdissect_options *ndo,
|
||||
{
|
||||
case TUNNEL_PASS:
|
||||
if (length < 3)
|
||||
{
|
||||
ND_PRINT((ndo, "%s", tstr));
|
||||
return;
|
||||
}
|
||||
goto trunc;
|
||||
if (*data && (*data <=0x1F) )
|
||||
ND_PRINT((ndo, "Tag[%u] ", *data));
|
||||
else
|
||||
@@ -525,10 +522,7 @@ print_attr_string(netdissect_options *ndo,
|
||||
if (*data <= 0x1F)
|
||||
{
|
||||
if (length < 1)
|
||||
{
|
||||
ND_PRINT((ndo, "%s", tstr));
|
||||
return;
|
||||
}
|
||||
goto trunc;
|
||||
if (*data)
|
||||
ND_PRINT((ndo, "Tag[%u] ", *data));
|
||||
else
|
||||
@@ -538,6 +532,8 @@ print_attr_string(netdissect_options *ndo,
|
||||
}
|
||||
break;
|
||||
case EGRESS_VLAN_NAME:
|
||||
if (length < 1)
|
||||
goto trunc;
|
||||
ND_PRINT((ndo, "%s (0x%02x) ",
|
||||
tok2str(rfc4675_tagged,"Unknown tag",*data),
|
||||
*data));
|
||||
@@ -546,7 +542,7 @@ print_attr_string(netdissect_options *ndo,
|
||||
break;
|
||||
}
|
||||
|
||||
for (i=0; *data && i < length ; i++, data++)
|
||||
for (i=0; i < length && *data; i++, data++)
|
||||
ND_PRINT((ndo, "%c", (*data < 32 || *data > 126) ? '.' : *data));
|
||||
|
||||
return;
|
||||
|
Reference in New Issue
Block a user