osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

manuf: Change struct ws_manuf block size 

We only ever use 5 bytes at most so change the block size from
6 to 5.
This commit is contained in:
João Valverde 2023-08-31 12:34:48 +01:00
parent 76f29a9b79
commit 17ef4b5802
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
epan/manuf.c
View File

@ -172,10 +172,9 @@ ws_manuf_lookup_str(const uint8_t addr[6], const char **long_name_ptr)
static inline struct ws_manuf *
copy_oui24(struct ws_manuf *dst, const manuf_oui24_t *src)
{
memcpy(dst->addr, src->oui24, sizeof(src->oui24));
dst->addr[3] = 0;
dst->addr[4] = 0;
dst->addr[5] = 0;
memcpy(dst->block, src->oui24, sizeof(src->oui24));
dst->block[3] = 0;
dst->block[4] = 0;
dst->mask = 24;
dst->short_name = src->short_name;
dst->long_name = src->long_name;
@ -185,9 +184,8 @@ copy_oui24(struct ws_manuf *dst, const manuf_oui24_t *src)
static inline struct ws_manuf *
copy_oui28(struct ws_manuf *dst, const manuf_oui28_t *src)
{
memcpy(dst->addr, src->oui28, sizeof(src->oui28));
dst->addr[4] = 0;
dst->addr[5] = 0;
memcpy(dst->block, src->oui28, sizeof(src->oui28));
dst->block[4] = 0;
dst->mask = 28;
dst->short_name = src->short_name;
dst->long_name = src->long_name;
@ -197,8 +195,7 @@ copy_oui28(struct ws_manuf *dst, const manuf_oui28_t *src)
static inline struct ws_manuf *
copy_oui36(struct ws_manuf *dst, const manuf_oui36_t *src)
{
memcpy(dst->addr, src->oui36, sizeof(src->oui36));
dst->addr[5] = 0;
memcpy(dst->block, src->oui36, sizeof(src->oui36));
dst->mask = 36;
dst->short_name = src->short_name;
dst->long_name = src->long_name;
@ -250,7 +247,7 @@ ws_manuf_iter_next(ws_manuf_iter_t *iter, struct ws_manuf *result)
* There is at least one entry and index 0 is non-empty. */
ptr = vector[0];
for (size_t i = 1; i < idx; i++) {
if (vector[i] && memcmp(vector[i]->addr, ptr->addr, 6) < 0) {
if (vector[i] && memcmp(vector[i]->block, ptr->block, MANUF_BLOCK_SIZE) < 0) {
ptr = vector[i];
}
}
@ -288,15 +285,15 @@ ws_manuf_block_str(char *buf, size_t buf_size, const struct ws_manuf *ptr)
{
if (ptr->mask == 24) {
snprintf(buf, buf_size, "%02"PRIX8":%02"PRIX8":%02"PRIX8,
ptr->addr[0], ptr->addr[1], ptr->addr[2]);
ptr->block[0], ptr->block[1], ptr->block[2]);
}
else if (ptr->mask == 28) {
snprintf(buf, buf_size, "%02"PRIX8":%02"PRIX8":%02"PRIX8":%02"PRIX8"/%"PRIu8,
ptr->addr[0], ptr->addr[1], ptr->addr[2], ptr->addr[3], ptr->mask);
ptr->block[0], ptr->block[1], ptr->block[2], ptr->block[3], ptr->mask);
}
else if (ptr->mask == 36) {
snprintf(buf, buf_size, "%02"PRIX8":%02"PRIX8":%02"PRIX8":%02"PRIX8":%02"PRIX8"/%"PRIu8,
ptr->addr[0], ptr->addr[1], ptr->addr[2], ptr->addr[3], ptr->addr[4], ptr->mask);
ptr->block[0], ptr->block[1], ptr->block[2], ptr->block[3], ptr->block[4], ptr->mask);
}
else {
ws_assert_not_reached();

4
epan/manuf.h
View File

@ -15,8 +15,10 @@
extern "C" {
#endif /* __cplusplus */
#define MANUF_BLOCK_SIZE 5
struct ws_manuf {
uint8_t addr[6];
uint8_t block[MANUF_BLOCK_SIZE];
uint8_t mask;
const char *short_name;
const char *long_name;

4
ui/qt/models/manuf_table_model.cpp
View File

@ -30,9 +30,9 @@ ManufTableItem::ManufTableItem(struct ws_manuf *ptr) :
}
// Note: since 'ptr' is not stable, a deep copy is needed.
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
block_bytes_ = QByteArray(reinterpret_cast<const char *>(ptr->addr), size);
block_bytes_ = QByteArray(reinterpret_cast<const char *>(ptr->block), size);
#else
block_bytes_ = QByteArray(reinterpret_cast<const char *>(ptr->addr), static_cast<int>(size));
block_bytes_ = QByteArray(reinterpret_cast<const char *>(ptr->block), static_cast<int>(size));
#endif
char buf[64];