mirror of
https://git.rtems.org/rtems-libbsd/
synced 2025-10-14 21:25:12 +08:00
Update to FreeBSD head 2018-02-01
Git mirror commit d079ae0442af8fa3cfd6d7ede190d04e64a2c0d4. Update #3472.
This commit is contained in:
@@ -34,9 +34,17 @@
|
||||
*/
|
||||
|
||||
static int
|
||||
l_strnstart(const char *tstr1, u_int tl1, const char *str2, u_int l2)
|
||||
l_strnstart(netdissect_options *ndo, const char *tstr1, u_int tl1,
|
||||
const char *str2, u_int l2)
|
||||
{
|
||||
|
||||
if (!ND_TTEST2(*str2, tl1)) {
|
||||
/*
|
||||
* We don't have tl1 bytes worth of captured data
|
||||
* for the string, so we can't check for this
|
||||
* string.
|
||||
*/
|
||||
return 0;
|
||||
}
|
||||
if (tl1 > l2)
|
||||
return 0;
|
||||
|
||||
@@ -47,19 +55,19 @@ void
|
||||
beep_print(netdissect_options *ndo, const u_char *bp, u_int length)
|
||||
{
|
||||
|
||||
if (l_strnstart("MSG", 4, (const char *)bp, length)) /* A REQuest */
|
||||
if (l_strnstart(ndo, "MSG", 4, (const char *)bp, length)) /* A REQuest */
|
||||
ND_PRINT((ndo, " BEEP MSG"));
|
||||
else if (l_strnstart("RPY ", 4, (const char *)bp, length))
|
||||
else if (l_strnstart(ndo, "RPY ", 4, (const char *)bp, length))
|
||||
ND_PRINT((ndo, " BEEP RPY"));
|
||||
else if (l_strnstart("ERR ", 4, (const char *)bp, length))
|
||||
else if (l_strnstart(ndo, "ERR ", 4, (const char *)bp, length))
|
||||
ND_PRINT((ndo, " BEEP ERR"));
|
||||
else if (l_strnstart("ANS ", 4, (const char *)bp, length))
|
||||
else if (l_strnstart(ndo, "ANS ", 4, (const char *)bp, length))
|
||||
ND_PRINT((ndo, " BEEP ANS"));
|
||||
else if (l_strnstart("NUL ", 4, (const char *)bp, length))
|
||||
else if (l_strnstart(ndo, "NUL ", 4, (const char *)bp, length))
|
||||
ND_PRINT((ndo, " BEEP NUL"));
|
||||
else if (l_strnstart("SEQ ", 4, (const char *)bp, length))
|
||||
else if (l_strnstart(ndo, "SEQ ", 4, (const char *)bp, length))
|
||||
ND_PRINT((ndo, " BEEP SEQ"));
|
||||
else if (l_strnstart("END", 4, (const char *)bp, length))
|
||||
else if (l_strnstart(ndo, "END", 4, (const char *)bp, length))
|
||||
ND_PRINT((ndo, " BEEP END"));
|
||||
else
|
||||
ND_PRINT((ndo, " BEEP (payload or undecoded)"));
|
||||
|
Reference in New Issue
Block a user