Actually add geoip.c + improved error handling

3 files changed, 90 insertions, 4 deletions

diff --git a/src/geoip.c b/src/geoip.c
new file mode 100644
index 0000000..734e454
--- /dev/null
+++ b/src/geoip.c
@@ -0,0 +1,85 @@
+/* ncdc - NCurses Direct Connect client
+
+  Copyright (c) 2011-2014 Yoran Heling
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+
+#include "ncdc.h"
+#include "geoip.h"
+
+gboolean geoip_available = FALSE;
+
+#ifdef USE_GEOIP
+static GeoIP *geoip4;
+static GeoIP *geoip6;
+#endif
+
+
+void geoip_reinit() {
+#ifdef USE_GEOIP
+  if(geoip4)
+    GeoIP_delete(geoip4);
+  if(geoip6)
+    GeoIP_delete(geoip6);
+  /* Get the file paths directly, so that we can offer more useful diagnostic
+   * messages in case we fail to open it. Calling GeoIP_db_avail() ensures that
+   * the GeoIPDBFileName variable has been initialized. */
+  if(!GeoIPDBFileName)
+      GeoIP_db_avail(GEOIP_COUNTRY_EDITION);
+  const char *f4 = GeoIPDBFileName[GEOIP_COUNTRY_EDITION];
+  const char *f6 = GeoIPDBFileName[GEOIP_COUNTRY_EDITION_V6];
+
+  /* The '16' flag is GEOIP_SILENCE, but it's a fairly new option and not
+   * defined in older versions. Just pass it along directly, ABI compatibility
+   * should ensure this works with both old and new versions.
+   * Also perform a g_file_test() first to ensure we're not opening
+   * non-existing files. GeoIP versions that do not support GEOIP_SILENCE will
+   * throw error messages on stdout, which screws up our ncurses UI, so
+   * catching the most common error here is worth it. */
+  geoip4 = g_file_test(f4, G_FILE_TEST_EXISTS) ? GeoIP_open(f4, 16 | GEOIP_MEMORY_CACHE) : NULL;
+  geoip6 = g_file_test(f6, G_FILE_TEST_EXISTS) ? GeoIP_open(f6, 16 | GEOIP_MEMORY_CACHE) : NULL;
+  if(!geoip4)
+    ui_mf(uit_main_tab, 0, "Unable to open '%s', no country codes will be displayed for IPv4 addresses.", f4);
+  if(!geoip6)
+    ui_mf(uit_main_tab, 0, "Unable to open '%s', no country codes will be displayed for IPv6 addresses.", f6);
+  geoip_available = geoip4 || geoip6;
+#endif
+}
+
+
+const char *geoip_country4(const char *ip) {
+#ifdef USE_GEOIP
+  if(geoip4)
+    return GeoIP_country_code_by_addr(geoip4, ip);
+#endif
+  return NULL;
+}
+
+
+const char *geoip_country6(const char *ip) {
+#ifdef USE_GEOIP
+  if(geoip6)
+    return GeoIP_country_code_by_addr_v6(geoip6, ip);
+#endif
+  return NULL;
+}
diff --git a/src/main.c b/src/main.c
index 7a5da82..eaf51c9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -451,9 +451,9 @@ int main(int argc, char **argv) {
   listen_global_init();
   cc_global_init();
   dl_init_global();
-  geoip_reinit();
   ui_cmdhist_init("history");
   ui_init(bracketed_paste);
+  geoip_reinit();
 
   // setup SIGWINCH
   struct sigaction act;
diff --git a/src/uit_userlist.c b/src/uit_userlist.c
index db5766f..4a0c96b 100644
--- a/src/uit_userlist.c
+++ b/src/uit_userlist.c
@@ -167,9 +167,10 @@ static void draw_row(ui_listing_t *list, GSequenceIter *iter, int row, void *dat
     mvaddch(row, 4, 't');
 
   int j = 6;
-  DRAW_COL(row, j, t->cw_country,
-      !ip4_isany(user->ip4) ? geoip_country4(ip4_unpack(user->ip4)) :
-      !ip6_isany(user->ip6) ? geoip_country6(ip6_unpack(user->ip6)) : "");
+  const char *cc =
+    !ip4_isany(user->ip4) ? geoip_country4(ip4_unpack(user->ip4)) :
+    !ip6_isany(user->ip6) ? geoip_country6(ip6_unpack(user->ip6)) : NULL;
+  DRAW_COL(row, j, t->cw_country, cc?cc:"");
   if(t->cw_user > 1)
     ui_listing_draw_match(list, iter, row, j, str_offset_from_columns(user->name, t->cw_user-1));
   j += t->cw_user;