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

parsing enterprises file: comment and slightly simplify 

This is roughly 10% of tshark startup time.
- Enterprise string does not need to be trimmed at the beginning
- No need to call g_hash_table_replace() as keys are just guint32
This commit is contained in:
Martin Mathieson 2020-11-07 22:11:21 +00:00 committed by AndersBroman
parent dfa8a3fe5a
commit 07f048f1f2
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/addr_resolv.c
View File

@ -857,20 +857,30 @@ parse_enterprises_line (char *line)
{
char *tok, *dec_str, *org_str;
guint32 dec;
gboolean had_comment = FALSE;
if ((tok = strchr(line, '#')))
/* Stop the line at any comment found */
if ((tok = strchr(line, '#'))) {
*tok = '\0';
had_comment = TRUE;
}
/* Get enterprise number */
dec_str = strtok(line, " \t");
if (!dec_str)
return;
/* Get enterprise name */
org_str = strtok(NULL, ""); /* everything else */
if (org_str)
org_str = g_strstrip(org_str);
if (org_str && had_comment) {
/* Only need to strip after (between name and where comment was) */
org_str = g_strchomp(org_str);
}
if (!org_str)
return;
/* Add entry using number as key */
if (!ws_strtou32(dec_str, NULL, &dec))
return;
g_hash_table_replace(enterprises_hashtable, GUINT_TO_POINTER(dec), g_strdup(org_str));
g_hash_table_insert(enterprises_hashtable, GUINT_TO_POINTER(dec), g_strdup(org_str));
}