bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added GeoIP support

Browse Source
This commit is contained in:
Michiel Broek 2007-10-14 14:52:55 +00:00
parent 0fa2c6e0b1
commit 4f028c4ff1
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -12,6 +12,9 @@ v0.91.13 12-Oct-2007
mbnewusr: mbnewusr:
Added GeoIP support. Added GeoIP support.
mbnntp:
Added GeoIP support.
mbsetup: mbsetup:
Blocked selection of FTN and Usenet moderated message areas. Blocked selection of FTN and Usenet moderated message areas.
Changed the F-PROT scanner name into fpscan. Changed the F-PROT scanner name into fpscan.

40
mbnntp/mbnntp.c
View File

@ -102,12 +102,42 @@ int check_free(void)
#endif #endif
#ifdef HAVE_GEOIP_H
extern void _GeoIP_setup_dbfilename(void);
void geoiplookup(GeoIP* gi, char *hostname, int i)
{
const char * country_code;
const char * country_name;
const char * country_continent;
int country_id;
if (GEOIP_COUNTRY_EDITION == i) {
country_id = GeoIP_id_by_name(gi, hostname);
country_code = GeoIP_country_code[country_id];
country_name = GeoIP_country_name[country_id];
country_continent = GeoIP_country_continent[country_id];
if (country_code == NULL) {
Syslog('+', "%s: IP Address not found\n", GeoIPDBDescription[i]);
} else {
Syslog('+', "GeoIP location: %s, %s %s\n", country_name, country_code, country_continent);
}
}
}
#endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct passwd *pw; struct passwd *pw;
int i, rc; int i, rc;
socklen_t addrlen = sizeof(struct sockaddr_in); socklen_t addrlen = sizeof(struct sockaddr_in);
#ifdef HAVE_GEOIP_H
char *hostname;
GeoIP *gi;
#endif
/* /*
* The next trick is to supply a fake environment variable * The next trick is to supply a fake environment variable
@ -164,6 +194,16 @@ int main(int argc, char *argv[])
Syslog('s', "TCP connection: len=%d, family=%hd, port=%hu, addr=%s", Syslog('s', "TCP connection: len=%d, family=%hd, port=%hu, addr=%s",
addrlen,peeraddr.sin_family, peeraddr.sin_port, inet_ntoa(peeraddr.sin_addr)); addrlen,peeraddr.sin_family, peeraddr.sin_port, inet_ntoa(peeraddr.sin_addr));
Syslog('+', "Incoming connection from %s", inet_ntoa(peeraddr.sin_addr)); Syslog('+', "Incoming connection from %s", inet_ntoa(peeraddr.sin_addr));
#ifdef HAVE_GEOIP_H
hostname = inet_ntoa(peeraddr.sin_addr);
_GeoIP_setup_dbfilename();
if (GeoIP_db_avail(GEOIP_COUNTRY_EDITION)) {
if ((gi = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD)) != NULL) {
geoiplookup(gi, hostname, GEOIP_COUNTRY_EDITION);
}
GeoIP_delete(gi);
}
#endif
#ifdef USE_NEWSGATE #ifdef USE_NEWSGATE
send_nntp("400 Server closed"); send_nntp("400 Server closed");
#else #else