Fixed the IP plan, and added a honeypot net.

diff --git a/planning/planning.cpp b/planning/planning.cpp
index 1126890403f58a54986bccbf12b849414a4fda7a..0917a4e443ebd8c75b2ae030aaabe17e8fca3025 100755 (executable)
--- a/planning/planning.cpp
+++ b/planning/planning.cpp
@@ -334,8 +334,33 @@ int main(int argc, char **argv)
 
                fprintf(patchlist, "e%u-%u %s\n", last_row * 2 - 1, last_num + 1,
                        port_name(v.distro, ++num_ports_used[v.distro]).c_str());
-               fprintf(switchlist, "87.76.%u.%u 26 e%u-%u\n",
-                       i / 4, (i % 4) * 64, last_row * 2 - 1, last_num + 1);
+
+               switch (last_num + 1) {
+               case 1:
+                       fprintf(switchlist, "87.76.%u.0 26 e%u-%u\n",
+                               last_row * 2 - 1, last_row * 2 - 1, last_num + 1);
+                       break;
+               case 2:
+                       fprintf(switchlist, "87.76.%u.64 26 e%u-%u\n",
+                               last_row * 2 - 1, last_row * 2 - 1, last_num + 1);
+                       break;
+               case 3:
+                       fprintf(switchlist, "87.76.%u.128 26 e%u-%u\n",
+                               last_row * 2 - 1, last_row * 2 - 1, last_num + 1);
+                       break;
+               case 4:
+                       fprintf(switchlist, "87.76.%u.0 26 e%u-%u\n",
+                               last_row * 2, last_row * 2 - 1, last_num + 1);
+                       break;
+               case 5:
+                       fprintf(switchlist, "87.76.%u.64 26 e%u-%u\n",
+                               last_row * 2, last_row * 2 - 1, last_num + 1);
+                       break;
+               case 6:
+                       fprintf(switchlist, "87.76.%u.128 26 e%u-%u\n",
+                               last_row * 2, last_row * 2 - 1, last_num + 1);
+                       break;
+               }
        }
        printf("\n");
 

diff --git a/static-switches.txt b/static-switches.txt
index 5fdf2456fdcddabbb7bd1a1def2c834ca1b66336..2619cd7007e5551953bee0f448446cfc2233cf90 100644 (file)
--- a/static-switches.txt
+++ b/static-switches.txt
@@ -1,3 +1,4 @@
+87.76.32.0 26 e31-4
 87.76.119.0 24 hoa-gutta
 87.76.120.0 24 crew
 87.76.130.0 24 noc-wlan