search

ntop / ipt_geofence

Geographical host protection for Linux/FreeBSD
GNU Affero General Public License v3.0
101 stars 16 forks source link

implements continent support #11

Closed frenzis01 closed 2 years ago

frenzis01 commented 2 years ago

Added continent support by merging countries and continents logic and structures along with proper method/variables renaming. In particular: Used the same map in Configuration.cpp for countries and continents as @salvogs and @JacopoRaffi did in #9 #8. Added "continents" field in sample_config.json, parsed using the same code previously used to parse "countries"; (as suggested in #7 #6 by @leomanne @RootCero) Updated getMarker(aka getCountryMarker) in Configuration.cpp to look also for continents, but giving priority to countries; (same pattern used in #9 by @salvogs) Updated NwInterface.cpp to search also for continents (added parameters when calling geoip->lookup) and to print to stdout continent codes along with IPs, ports, etc.

lucaderi commented 2 years ago

Can you please solve the merge conflict? In essence, you need to rebase your repository that is no longer in sync with mine. See https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork for instance

lucaderi commented 2 years ago

Fixes #3