added auto-detection of relay host for Belladonna

removed auto-detection for Lagavulin (which doesn't exist anymore)


git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@137 83718e91-0e4f-0410-abf4-91180603181f

1 files changed, 9 insertions, 12 deletions

diff --git a/src/senddata.cc b/src/senddata.cc
index 3f31f4a..22f9fc8 100644
--- a/src/senddata.cc
+++ b/src/senddata.cc
@@ -170,18 +170,8 @@ namespace Formaline
         Util_GetHostName (run_host, sizeof run_host);
         if (strncmp (run_host, "ic", 2) == 0 && strlen (run_host) == 6)
         {
-          // Peyote or Lagavulin
-          int const node = atoi (run_host + 2);
-          if (node < 192)
-          {
-            // Peyote
-            my_relay_host = "peyote";
-          }
-          else
-          {
-            // Lagavulin
-            my_relay_host = "lagavulin";
-          }
+          // Peyote
+          my_relay_host = "peyote";
         }
         else if (strncmp (run_host, "mike", 4) == 0 && strlen (run_host) == 7)
         {
@@ -195,6 +185,13 @@ namespace Formaline
           // Damiana
           my_relay_host = "damiana";
         }
+        else if (strlen (run_host) == 14 &&
+                 strncmp (run_host, "node", 4) == 0 &&
+                 strncmp (run_host + 8, ".admin", 6) == 0)
+        {
+          // Belladonna
+          my_relay_host = "belladonna";
+        }
         else
         {
           // Don't know a good relay host; try without