commons.c (goaccess-1.6.5) | : | commons.c (goaccess-1.7) | ||
---|---|---|---|---|
skipping to change at line 77 | skipping to change at line 77 | |||
{"VISIT_TIMES" , VISIT_TIMES} , | {"VISIT_TIMES" , VISIT_TIMES} , | |||
{"VIRTUAL_HOSTS" , VIRTUAL_HOSTS} , | {"VIRTUAL_HOSTS" , VIRTUAL_HOSTS} , | |||
{"REFERRERS" , REFERRERS} , | {"REFERRERS" , REFERRERS} , | |||
{"REFERRING_SITES" , REFERRING_SITES} , | {"REFERRING_SITES" , REFERRING_SITES} , | |||
{"KEYPHRASES" , KEYPHRASES} , | {"KEYPHRASES" , KEYPHRASES} , | |||
{"STATUS_CODES" , STATUS_CODES} , | {"STATUS_CODES" , STATUS_CODES} , | |||
{"REMOTE_USER" , REMOTE_USER} , | {"REMOTE_USER" , REMOTE_USER} , | |||
{"CACHE_STATUS" , CACHE_STATUS} , | {"CACHE_STATUS" , CACHE_STATUS} , | |||
#ifdef HAVE_GEOLOCATION | #ifdef HAVE_GEOLOCATION | |||
{"GEO_LOCATION" , GEO_LOCATION} , | {"GEO_LOCATION" , GEO_LOCATION} , | |||
{"ASN" , ASN} , | ||||
#endif | #endif | |||
{"MIME_TYPE" , MIME_TYPE} , | {"MIME_TYPE" , MIME_TYPE} , | |||
{"TLS_TYPE" , TLS_TYPE} , | {"TLS_TYPE" , TLS_TYPE} , | |||
}; | }; | |||
/* *INDENT-ON* */ | /* *INDENT-ON* */ | |||
/* Get number of items per panel to parse. | /* Get number of items per panel to parse. | |||
* | * | |||
* The number of items per panel is returned. */ | * The number of items per panel is returned. */ | |||
int | int | |||
skipping to change at line 427 | skipping to change at line 428 | |||
if (!strstr (conf.log_format, "%M") && ignore_panel_idx < TOTAL_MODULES) { | if (!strstr (conf.log_format, "%M") && ignore_panel_idx < TOTAL_MODULES) { | |||
if (str_inarray ("MIME_TYPE", conf.ignore_panels, ignore_panel_idx) < 0) | if (str_inarray ("MIME_TYPE", conf.ignore_panels, ignore_panel_idx) < 0) | |||
remove_module (MIME_TYPE); | remove_module (MIME_TYPE); | |||
} | } | |||
if (!strstr (conf.log_format, "%K") && ignore_panel_idx < TOTAL_MODULES) { | if (!strstr (conf.log_format, "%K") && ignore_panel_idx < TOTAL_MODULES) { | |||
if (str_inarray ("TLS_TYPE", conf.ignore_panels, ignore_panel_idx) < 0) | if (str_inarray ("TLS_TYPE", conf.ignore_panels, ignore_panel_idx) < 0) | |||
remove_module (TLS_TYPE); | remove_module (TLS_TYPE); | |||
} | } | |||
#ifdef HAVE_GEOLOCATION | #ifdef HAVE_GEOLOCATION | |||
#ifdef HAVE_LIBMAXMINDDB | #ifdef HAVE_LIBMAXMINDDB | |||
if (!conf.geoip_database && ignore_panel_idx < TOTAL_MODULES) { | if (!conf.geoip_db_idx && ignore_panel_idx < TOTAL_MODULES) { | |||
if (str_inarray ("GEO_LOCATION", conf.ignore_panels, ignore_panel_idx) < 0) | if (str_inarray ("GEO_LOCATION", conf.ignore_panels, ignore_panel_idx) < 0) | |||
remove_module (GEO_LOCATION); | remove_module (GEO_LOCATION); | |||
} | } | |||
if (!conf.geoip_db_idx && ignore_panel_idx < TOTAL_MODULES) { | ||||
if (str_inarray ("ASN", conf.ignore_panels, ignore_panel_idx) < 0) | ||||
remove_module (ASN); | ||||
} | ||||
#endif | #endif | |||
#endif | #endif | |||
} | } | |||
/* Build an array of available modules (ignores listed panels). | /* Build an array of available modules (ignores listed panels). | |||
* | * | |||
* If there are no modules enabled, 0 is returned. | * If there are no modules enabled, 0 is returned. | |||
* On success, the first enabled module is returned. */ | * On success, the first enabled module is returned. */ | |||
int | int | |||
init_modules (void) { | init_modules (void) { | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 6 lines changed or added |