kaffa/XDP-Firewall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename config functions.

Browse Source
This commit is contained in:
gamemann
2021-11-12 16:51:29 +00:00
parent b0f60b05db
commit aa85496ced
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.c
View File

@@ -10,7 +10,7 @@
FILE *file;
void SetConfigDefaults(struct config_map *cfg)
void setcfgdefaults(struct config_map *cfg)
{
cfg->updateTime = 0;
cfg->interface = "eth0";
@@ -73,7 +73,7 @@ void SetConfigDefaults(struct config_map *cfg)
}
}
int OpenConfig(const char *FileName)
int opencfg(const char *FileName)
{
// Close any existing files.
if (file != NULL)
@@ -93,7 +93,7 @@ int OpenConfig(const char *FileName)
return 0;
}
int ReadConfig(struct config_map *cfg)
int readcfg(struct config_map *cfg)
{
// Not sure why this would be set to NULL after checking for it in OpenConfig(), but just for safety.
if (file == NULL)

6
src/config.h
View File

@@ -10,6 +10,6 @@ struct config_map
struct filter filters[MAX_FILTERS];
};
void SetConfigDefaults(struct config_map *cfg);
int OpenConfig(const char *FileName);
int ReadConfig(struct config_map *cfg);
void setcfgdefaults(struct config_map *cfg);
int opencfg(const char *FileName);
int readcfg(struct config_map *cfg);

12
src/xdpfw.c
View File

@@ -61,14 +61,14 @@ void updatefilters(struct config_map *conf)
int updateconfig(struct config_map *conf, char *configFile)
{
// Open config file.
if (OpenConfig(configFile) != 0)
if (opencfg(configFile) != 0)
{
fprintf(stderr, "Error opening filters file: %s\n", configFile);
return -1;
}
SetConfigDefaults(conf);
setcfgdefaults(conf);
for (uint16_t i = 0; i < MAX_FILTERS; i++)
{
@@ -76,7 +76,7 @@ int updateconfig(struct config_map *conf, char *configFile)
}
// Read config and check for errors.
if (ReadConfig(conf) != 0)
if (readcfg(conf) != 0)
{
fprintf(stderr, "Error reading filters file.\n");
@@ -121,8 +121,8 @@ int loadbpfobj(const char *filename)
return -1;
}
filter_map_fd = find_map_fd(obj, "filters_map");
stats_map_fd = find_map_fd(obj, "stats_map");
filter_map_fd = findmapfd(obj, "filters_map");
stats_map_fd = findmapfd(obj, "stats_map");
return first_prog_fd;
}
@@ -267,7 +267,7 @@ int main(int argc, char *argv[])
// Initialize config.
struct config_map *conf = malloc(sizeof(struct config_map));
SetConfigDefaults(conf);
setcfgdefaults(conf);
// Create last updated variable.
time_t lastUpdated = time(NULL);