diff options
Diffstat (limited to 'planning/planning.cpp')
| -rw-r--r-- | planning/planning.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/planning/planning.cpp b/planning/planning.cpp index cf69af2..e809359 100644 --- a/planning/planning.cpp +++ b/planning/planning.cpp @@ -48,11 +48,12 @@ // 5.5m between the two half rows #define HORIZ_GAP_COST 55 -#define FIRST_SUBNET_ADDRESS "88.92.80.0" -#define FIRST_MGMT_ADDRESS "88.92.0.0" +#define FIRST_SUBNET_ADDRESS "88.92.0.0" +#define FIRST_MGMT_ADDRESS "151.216.130.0" #define SUBNET_SIZE 26 +#define MGMT_SUBNET_SIZE 24 #define IPV6_PREFIX "2a06:5844:e:" -#define IPV6_MGMT_PREFIX "2a06:5841:d:" +#define IPV6_MGMT_PREFIX "2a06:5841:f:10:" #define _INF 99999 @@ -718,11 +719,11 @@ int Planner::do_work(int distro_placements[NUM_DISTRO]) fprintf(switchlist, "e%u-%u %s/%u %s%d%u::/64 ",switches[i].row * 2 - 1, switches[i].num + 1, inet_ntoa(subnet_addr4), SUBNET_SIZE, IPV6_PREFIX, switches[i].row * 2 -1, switches[i].num +1); - fprintf(switchlist, "%s/26 %s%u::%u/64 1%02u%u %s\n", + fprintf(switchlist, "%s/24 %s%u::%u/64 1%02u%u %s\n", inet_ntoa(mgmt_ip4), IPV6_MGMT_PREFIX, distro + 1, fourth_oct_mgmt, switches[i].row * 2 - 1, switches[i].num + 1, distro_name(distro).c_str()); - subnet_address = htonl(ntohl(subnet_address) + (1ULL << (32 - SUBNET_SIZE))); + subnet_address = htonl(ntohl(subnet_address) + (1ULL << (32 - MGMT_SUBNET_SIZE))); } fclose(patchlist); fclose(switchlist); |