Skip to content

Fixed some bugs referred to GeoIP #984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddpbsd merged 2 commits into from
Nov 3, 2016
Merged

Fixed some bugs referred to GeoIP #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6a3eff
Fixed bug at rules with if_matched_sid option
vikman90 Nov 2, 2016
6134b14
Fixed memory leak when getting GeoIP info at alert logging
vikman90 Nov 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/analysisd/alerts/log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ void OS_LogOutput(Eventinfo *lf)
{
#ifdef LIBGEOIP_ENABLED
if (Config.geoipdb_file) {
if (lf->srcip) {
lf->srcgeoip = GetGeoInfobyIP(lf->srcip);
if (lf->srcip && !lf->srcgeoip) {
lf->srcgeoip = GetGeoInfobyIP(lf->srcip);
}
if (lf->dstip) {
lf->dstgeoip = GetGeoInfobyIP(lf->dstip);
if (lf->dstip && !lf->dstgeoip) {
lf->dstgeoip = GetGeoInfobyIP(lf->dstip);
}
}
#endif
Expand Down Expand Up @@ -169,11 +169,11 @@ void OS_Log(Eventinfo *lf)
{
#ifdef LIBGEOIP_ENABLED
if (Config.geoipdb_file) {
if (lf->srcip) {
lf->srcgeoip = GetGeoInfobyIP(lf->srcip);
if (lf->srcip && !lf->srcgeoip) {
lf->srcgeoip = GetGeoInfobyIP(lf->srcip);
}
if (lf->dstip) {
lf->dstgeoip = GetGeoInfobyIP(lf->dstip);
if (lf->dstip && !lf->dstgeoip) {
lf->dstgeoip = GetGeoInfobyIP(lf->dstip);
}
}
#endif
Expand Down
4 changes: 0 additions & 4 deletions src/analysisd/rules.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,10 +1228,6 @@ int Rules_OP_ReadRules(const char *rulefile)

/* Mark rules that match this id */
OS_MarkID(NULL, config_ruleinfo);

/* Set function pointer */
config_ruleinfo->event_search = (void *(*)(void *, void *))
Search_LastEvents;
}

/* Mark the rules that match if_matched_group */
Expand Down