Skip to content
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

PPPoE, ARCnet, DECnet and MTP3 assorted improvements #1449

Merged
merged 11 commits into from
Jan 31, 2025
Merged

PPPoE, ARCnet, DECnet and MTP3 assorted improvements #1449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dd860da
TESTrun: Make some naming more consistent.
infrastation Jan 30, 2025
ed3d5bd
filtertest: Refine usage printing, exiting, etc.
infrastation Jan 29, 2025
bd7d289
Start testing filter programs on savefiles.
infrastation Jan 29, 2025
627fd12
Use a 16-bit comparison for "pppoes NUM".
infrastation Jan 25, 2025
d83582c
Clean up some name to address translation code.
infrastation Jan 26, 2025
3ed87a1
TESTrun: Add more filter tests for "broadcast" and "multicast".
infrastation Jan 26, 2025
2b01095
Fix, test and document ARCnet address parsing.
infrastation Jan 26, 2025
67a3392
TESTrun: Add one unoptimized leg for DECnet.
infrastation Jan 27, 2025
6f8a28c
Use fewer EtherType comparisons for DECnet.
infrastation Jan 27, 2025
62979bf
Use 32-bit comparisons for "decnet dst" when possible.
infrastation Jan 27, 2025
2aebf46
Use a 16-bit comparison for "dpc".
infrastation Jan 28, 2025
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
17 changes: 3 additions & 14 deletions etherent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <string.h>

#include "pcap-int.h"
#include "nametoaddr.h"

#include <pcap/namedb.h>

Expand All @@ -40,18 +41,6 @@
static inline int skip_space(FILE *);
static inline int skip_line(FILE *);

/* Hex digit to integer. */
static inline u_char
xdtoi(u_char c)
{
if (c >= '0' && c <= '9')
return (u_char)(c - '0');
else if (c >= 'a' && c <= 'f')
return (u_char)(c - 'a' + 10);
else
return (u_char)(c - 'A' + 10);
}

/*
* Skip linear white space (space and tab) and any CRs before LF.
* Stop when we hit a non-white-space character or an end-of-line LF.
Expand Down Expand Up @@ -109,13 +98,13 @@ pcap_next_etherent(FILE *fp)

/* must be the start of an address */
for (i = 0; i < 6; i += 1) {
d = xdtoi((u_char)c);
d = pcapint_xdtoi((u_char)c);
c = getc(fp);
if (c == EOF)
return (NULL);
if (PCAP_ISXDIGIT(c)) {
d <<= 4;
d |= xdtoi((u_char)c);
d |= pcapint_xdtoi((u_char)c);
c = getc(fp);
if (c == EOF)
return (NULL);
Expand Down
Loading