Skip to content

Standardize some error messages (bogus->invalid) #1584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 16, 2025
+5 −5
Merged

Standardize some error messages (bogus->invalid) #1584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rpcapd/daemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2411,7 +2411,7 @@ daemon_unpackapplyfilter(PCAP_SOCKET sockctrl, SSL *ctrl_ssl, struct session *se
//
if (bpf_validate(bf_prog.bf_insns, bf_prog.bf_len) == 0)
{
snprintf(errmsgbuf, PCAP_ERRBUF_SIZE, "The filter contains bogus instructions");
snprintf(errmsgbuf, PCAP_ERRBUF_SIZE, "The filter contains invalid instructions");
return -2;
}

Expand Down
4 changes: 2 additions & 2 deletions scanner.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,14 +396,14 @@ ${B} { yylval->s = sdup(yyextra, yytext); return AID; }
{V6} {
struct in6_addr addr;
if (1 != inet_pton(AF_INET6, yytext, &addr)) {
bpf_set_error(yyextra, "bogus IPv6 address %s", yytext);
bpf_set_error(yyextra, "invalid IPv6 address %s", yytext);
yylval->s = NULL;
} else {
yylval->s = sdup(yyextra, (char *)yytext);
}
return HID6;
}
{B}:+({B}:+)+ { bpf_set_error(yyextra, "bogus ethernet address %s", yytext); yylval->s = NULL; return EID; }
{B}:+({B}:+)+ { bpf_set_error(yyextra, "invalid ethernet address %s", yytext); yylval->s = NULL; return EID; }
icmptype { yylval->h = 0; return NUM; }
icmpcode { yylval->h = 1; return NUM; }
icmp-echoreply { yylval->h = 0; return NUM; }
Expand Down
4 changes: 2 additions & 2 deletions testprogs/TESTrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18570,7 +18570,7 @@ sub errstr_invhost_ipv4 {

# scanner.l
sub errstr_invhost_ipv6 {
return sprintf ('bogus IPv6 address %s', shift);
return sprintf ('invalid IPv6 address %s', shift);
}

# ERRSTR_UNKNOWN_MAC48HOST
Expand Down Expand Up @@ -18633,7 +18633,7 @@ my @reject_tests = (
name => 'ether_host',
DLT => 'EN10MB',
expr => 'ether ab:cd:ef:0g:00:00',
errstr => 'bogus ethernet address',
errstr => 'invalid ethernet address',
},
{
name => 'pppoes_value',
Expand Down