settings.h (goaccess-1.6.5) | : | settings.h (goaccess-1.7) | ||
---|---|---|---|---|
skipping to change at line 38 | skipping to change at line 38 | |||
*/ | */ | |||
#ifndef SETTINGS_H_INCLUDED | #ifndef SETTINGS_H_INCLUDED | |||
#define SETTINGS_H_INCLUDED | #define SETTINGS_H_INCLUDED | |||
#include <stdint.h> | #include <stdint.h> | |||
#include "commons.h" | #include "commons.h" | |||
#define MAX_LINE_CONF 4096 | #define MAX_LINE_CONF 4096 | |||
#define MAX_EXTENSIONS 128 | #define MAX_EXTENSIONS 128 | |||
#define MAX_GEOIP_DBS 3 | ||||
#define MAX_IGNORE_IPS 1024 + 128 | #define MAX_IGNORE_IPS 1024 + 128 | |||
#define MAX_IGNORE_REF 64 | #define MAX_IGNORE_REF 64 | |||
#define MAX_CUSTOM_COLORS 64 | #define MAX_CUSTOM_COLORS 64 | |||
#define MAX_IGNORE_STATUS 64 | #define MAX_IGNORE_STATUS 64 | |||
#define MAX_OUTFORMATS 3 | #define MAX_OUTFORMATS 3 | |||
#define MAX_FILENAMES 3072 | #define MAX_FILENAMES 3072 | |||
#define MIN_DATENUM_FMT_LEN 7 | #define MIN_DATENUM_FMT_LEN 7 | |||
#define NO_CONFIG_FILE "No config file used" | #define NO_CONFIG_FILE "No config file used" | |||
typedef enum LOGTYPE { | typedef enum LOGTYPE { | |||
skipping to change at line 109 | skipping to change at line 110 | |||
const char *enable_panels[TOTAL_MODULES]; /* array of panels to enable */ | const char *enable_panels[TOTAL_MODULES]; /* array of panels to enable */ | |||
const char *filenames[MAX_FILENAMES]; /* log files */ | const char *filenames[MAX_FILENAMES]; /* log files */ | |||
const char *hide_referers[MAX_IGNORE_REF]; /* hide referrers from report */ | const char *hide_referers[MAX_IGNORE_REF]; /* hide referrers from report */ | |||
const char *ignore_ips[MAX_IGNORE_IPS]; /* array of ips to ignore */ | const char *ignore_ips[MAX_IGNORE_IPS]; /* array of ips to ignore */ | |||
const char *ignore_panels[TOTAL_MODULES]; /* array of panels to ignore */ | const char *ignore_panels[TOTAL_MODULES]; /* array of panels to ignore */ | |||
const char *ignore_referers[MAX_IGNORE_REF]; /* referrers to ignore */ | const char *ignore_referers[MAX_IGNORE_REF]; /* referrers to ignore */ | |||
const char *ignore_status[MAX_IGNORE_STATUS]; /* status to ignore */ | const char *ignore_status[MAX_IGNORE_STATUS]; /* status to ignore */ | |||
const char *output_formats[MAX_OUTFORMATS]; /* output format, e.g. , HTML */ | const char *output_formats[MAX_OUTFORMATS]; /* output format, e.g. , HTML */ | |||
const char *sort_panels[TOTAL_MODULES]; /* sorting options for each pane l */ | const char *sort_panels[TOTAL_MODULES]; /* sorting options for each pane l */ | |||
const char *static_files[MAX_EXTENSIONS]; /* static extensions */ | const char *static_files[MAX_EXTENSIONS]; /* static extensions */ | |||
const char *geoip_databases[MAX_GEOIP_DBS]; /* geoip db paths */ | ||||
/* Log/date/time formats */ | /* Log/date/time formats */ | |||
const char *tz_name; /* Canonical TZ name, e.g., America/Ch icago */ | const char *tz_name; /* Canonical TZ name, e.g., America/Ch icago */ | |||
char *date_time_format; /* date & time format */ | char *date_time_format; /* date & time format */ | |||
char *date_format; /* date format */ | char *date_format; /* date format */ | |||
char *date_num_format; /* numeric date format %Y%m%d */ | char *date_num_format; /* numeric date format %Y%m%d */ | |||
char *time_format; /* time format as given by the user */ | char *time_format; /* time format as given by the user */ | |||
char *spec_date_time_format; /* date format w/ specificity */ | char *spec_date_time_format; /* date format w/ specificity */ | |||
char *spec_date_time_num_format; /* numeric date format w/ specificity */ | char *spec_date_time_num_format; /* numeric date format w/ specificity */ | |||
char *log_format; /* log format */ | char *log_format; /* log format */ | |||
char *iconfigfile; /* config file path */ | char *iconfigfile; /* config file path */ | |||
char ***user_browsers_hash; /* custom list of browsers */ | char ***user_browsers_hash; /* custom list of browsers */ | |||
const char *debug_log; /* debug log path */ | const char *debug_log; /* debug log path */ | |||
const char *geoip_database; /* geoip db path */ | ||||
const char *html_custom_css; /* custom CSS */ | const char *html_custom_css; /* custom CSS */ | |||
const char *html_custom_js; /* custom JS */ | const char *html_custom_js; /* custom JS */ | |||
const char *html_prefs; /* default HTML JSON preferences */ | const char *html_prefs; /* default HTML JSON preferences */ | |||
const char *html_report_title; /* report title */ | const char *html_report_title; /* report title */ | |||
const char *invalid_requests_log; /* invalid lines log path */ | const char *invalid_requests_log; /* invalid lines log path */ | |||
const char *unknowns_log; /* unknown browsers/OSs log path */ | const char *unknowns_log; /* unknown browsers/OSs log path */ | |||
const char *pidfile; /* daemonize pid file path */ | const char *pidfile; /* daemonize pid file path */ | |||
const char *browsers_file; /* browser's file path */ | const char *browsers_file; /* browser's file path */ | |||
const char *db_path; /* db path to files */ | const char *db_path; /* db path to files */ | |||
const char *fname_as_vhost; /* filenames as vhost/server blocks */ | const char *fname_as_vhost; /* filenames as vhost/server blocks */ | |||
skipping to change at line 164 | skipping to change at line 165 | |||
int code444_as_404; /* 444 as 404s? */ | int code444_as_404; /* 444 as 404s? */ | |||
int color_scheme; /* color scheme */ | int color_scheme; /* color scheme */ | |||
int crawlers_only ; /* crawlers only */ | int crawlers_only ; /* crawlers only */ | |||
int daemonize; /* run program as a Unix daemon */ | int daemonize; /* run program as a Unix daemon */ | |||
const char *username; /* user to run program as */ | const char *username; /* user to run program as */ | |||
int double_decode; /* need to double decode */ | int double_decode; /* need to double decode */ | |||
int enable_html_resolver; /* html/json/csv resolver */ | int enable_html_resolver; /* html/json/csv resolver */ | |||
int geo_db; /* legacy geoip db */ | int geo_db; /* legacy geoip db */ | |||
int hl_header; /* highlight header on term */ | int hl_header; /* highlight header on term */ | |||
int ignore_crawlers; /* ignore crawlers */ | int ignore_crawlers; /* ignore crawlers */ | |||
int unknowns_as_crawlers; /* unknown OS and browsers are classified as crawlers */ | ||||
int ignore_qstr; /* ignore query string */ | int ignore_qstr; /* ignore query string */ | |||
int ignore_statics; /* ignore static files */ | int ignore_statics; /* ignore static files */ | |||
int json_pretty_print; /* pretty print JSON data */ | int json_pretty_print; /* pretty print JSON data */ | |||
int list_agents; /* show list of agents per host */ | int list_agents; /* show list of agents per host */ | |||
int load_conf_dlg; /* load curses config dialog */ | int load_conf_dlg; /* load curses config dialog */ | |||
int load_global_config; /* use global config file */ | int load_global_config; /* use global config file */ | |||
int max_items; /* max number of items to output */ | int max_items; /* max number of items to output */ | |||
int mouse_support; /* add curses mouse support */ | int mouse_support; /* add curses mouse support */ | |||
int no_color; /* no terminal colors */ | int no_color; /* no terminal colors */ | |||
int no_strict_status; /* don't enforce 100-599 status codes */ | int no_strict_status; /* don't enforce 100-599 status codes */ | |||
skipping to change at line 199 | skipping to change at line 201 | |||
uint32_t keep_last; /* number of days to keep in storage */ | uint32_t keep_last; /* number of days to keep in storage */ | |||
uint32_t num_tests; /* number of lines to test */ | uint32_t num_tests; /* number of lines to test */ | |||
uint64_t html_refresh; /* refresh html report every X of seconds */ | uint64_t html_refresh; /* refresh html report every X of seconds */ | |||
uint64_t log_size; /* log size override */ | uint64_t log_size; /* log size override */ | |||
/* Internal flags */ | /* Internal flags */ | |||
int bandwidth; /* is there bandwidth within the req line */ | int bandwidth; /* is there bandwidth within the req line */ | |||
int date_spec_hr; /* date specificity - hour */ | int date_spec_hr; /* date specificity - hour */ | |||
int has_geocity; | int has_geocity; | |||
int has_geocountry; | int has_geocountry; | |||
int has_geoasn; | ||||
int hour_spec_min; /* hour specificity - min */ | int hour_spec_min; /* hour specificity - min */ | |||
int read_stdin; /* read from stdin */ | int read_stdin; /* read from stdin */ | |||
int serve_usecs; /* is there time served within req line */ | int serve_usecs; /* is there time served within req line */ | |||
int stop_processing; /* stop all processing */ | int stop_processing; /* stop all processing */ | |||
int tailing_mode; /* in tailing-mode? */ | int tailing_mode; /* in tailing-mode? */ | |||
/* Array indices */ | /* Array indices */ | |||
int color_idx; /* colors index */ | int color_idx; /* colors index */ | |||
int enable_panel_idx; /* enable panels index */ | int enable_panel_idx; /* enable panels index */ | |||
int filenames_idx; /* filenames index */ | int filenames_idx; /* filenames index */ | |||
int hide_referer_idx; /* hide referrers index */ | int hide_referer_idx; /* hide referrers index */ | |||
int ignore_ip_idx; /* ignored ips index */ | int ignore_ip_idx; /* ignored ips index */ | |||
int ignore_panel_idx; /* ignored panels index */ | int ignore_panel_idx; /* ignored panels index */ | |||
int ignore_referer_idx; /* ignored referrers index */ | int ignore_referer_idx; /* ignored referrers index */ | |||
int ignore_status_idx; /* ignore status index */ | int ignore_status_idx; /* ignore status index */ | |||
int output_format_idx; /* output format index */ | int output_format_idx; /* output format index */ | |||
int sort_panel_idx; /* sort panel index */ | int sort_panel_idx; /* sort panel index */ | |||
int static_file_idx; /* static extensions index */ | int static_file_idx; /* static extensions index */ | |||
int geoip_db_idx; /* geoip db index */ | ||||
int browsers_hash_idx; /* browsers hash index */ | int browsers_hash_idx; /* browsers hash index */ | |||
size_t static_file_max_len; | size_t static_file_max_len; | |||
} GConf; | } GConf; | |||
/* *INDENT-ON* */ | /* *INDENT-ON* */ | |||
char *get_selected_date_str (size_t idx); | char *get_selected_date_str (size_t idx); | |||
char *get_selected_format_str (size_t idx); | char *get_selected_format_str (size_t idx); | |||
char *get_selected_time_str (size_t idx); | char *get_selected_time_str (size_t idx); | |||
End of changes. 6 change blocks. | ||||
1 lines changed or deleted | 5 lines changed or added |